Merge remote-tracking branch 'origin/work-notify' into beta
This commit is contained in:
commit
a600b1ac80
@ -20,6 +20,8 @@ g++ -v
|
|||||||
# build parity
|
# build parity
|
||||||
RUN git clone https://github.com/ethcore/parity && \
|
RUN git clone https://github.com/ethcore/parity && \
|
||||||
cd parity&&\
|
cd parity&&\
|
||||||
|
git checkout beta && \
|
||||||
|
git pull && \
|
||||||
ls -a&&\
|
ls -a&&\
|
||||||
cargo build --release --verbose && \
|
cargo build --release --verbose && \
|
||||||
ls /build/parity/target/release/parity && \
|
ls /build/parity/target/release/parity && \
|
||||||
|
@ -36,6 +36,8 @@ ENV CC aarch64-linux-gnu-gcc
|
|||||||
# build parity
|
# build parity
|
||||||
RUN git clone https://github.com/ethcore/parity && \
|
RUN git clone https://github.com/ethcore/parity && \
|
||||||
cd parity && \
|
cd parity && \
|
||||||
|
git checkout beta && \
|
||||||
|
git pull && \
|
||||||
mkdir -p .cargo && \
|
mkdir -p .cargo && \
|
||||||
echo '[target.aarch64-unknown-linux-gnu]\n\
|
echo '[target.aarch64-unknown-linux-gnu]\n\
|
||||||
linker = "aarch64-linux-gnu-gcc"\n'\
|
linker = "aarch64-linux-gnu-gcc"\n'\
|
||||||
|
@ -36,6 +36,8 @@ ENV CC arm-linux-gnueabihf-gcc
|
|||||||
# build parity
|
# build parity
|
||||||
RUN git clone https://github.com/ethcore/parity && \
|
RUN git clone https://github.com/ethcore/parity && \
|
||||||
cd parity && \
|
cd parity && \
|
||||||
|
git checkout beta && \
|
||||||
|
git pull && \
|
||||||
mkdir -p .cargo && \
|
mkdir -p .cargo && \
|
||||||
echo '[target.armv7-unknown-linux-gnueabihf]\n\
|
echo '[target.armv7-unknown-linux-gnueabihf]\n\
|
||||||
linker = "arm-linux-gnueabihf-gcc"\n'\
|
linker = "arm-linux-gnueabihf-gcc"\n'\
|
||||||
|
@ -47,6 +47,8 @@ g++ -v
|
|||||||
# build parity
|
# build parity
|
||||||
RUN git clone https://github.com/ethcore/parity && \
|
RUN git clone https://github.com/ethcore/parity && \
|
||||||
cd parity && \
|
cd parity && \
|
||||||
|
git checkout beta && \
|
||||||
|
git pull && \
|
||||||
cargo build --release --features ethcore/jit --verbose && \
|
cargo build --release --features ethcore/jit --verbose && \
|
||||||
ls /build/parity/target/release/parity && \
|
ls /build/parity/target/release/parity && \
|
||||||
strip /build/parity/target/release/parity
|
strip /build/parity/target/release/parity
|
||||||
|
@ -27,7 +27,9 @@ g++ -v
|
|||||||
# build parity
|
# build parity
|
||||||
RUN git clone https://github.com/ethcore/parity && \
|
RUN git clone https://github.com/ethcore/parity && \
|
||||||
cd parity && \
|
cd parity && \
|
||||||
|
git checkout beta && \
|
||||||
|
git pull && \
|
||||||
cargo build --release --verbose && \
|
cargo build --release --verbose && \
|
||||||
ls /build/parity/target/release/parity && \
|
ls /build/parity/target/release/parity && \
|
||||||
strip /build/parity/target/release/parity
|
strip /build/parity/target/release/parity
|
||||||
RUN file /build/parity/target/release/parity
|
RUN file /build/parity/target/release/parity
|
||||||
|
@ -266,7 +266,7 @@ impl Miner {
|
|||||||
let is_new = original_work_hash.map_or(true, |h| block.block().fields().header.hash() != h);
|
let is_new = original_work_hash.map_or(true, |h| block.block().fields().header.hash() != h);
|
||||||
sealing_work.push(block);
|
sealing_work.push(block);
|
||||||
// If push notifications are enabled we assume all work items are used.
|
// If push notifications are enabled we assume all work items are used.
|
||||||
if self.work_poster.is_some() {
|
if self.work_poster.is_some() && is_new {
|
||||||
sealing_work.use_last_ref();
|
sealing_work.use_last_ref();
|
||||||
}
|
}
|
||||||
(Some((pow_hash, difficulty, number)), is_new)
|
(Some((pow_hash, difficulty, number)), is_new)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
PARITY_DEB_URL=https://github.com/ethcore/parity/releases/download/v1.2.0/parity_linux_1.2.0-0_amd64.deb
|
PARITY_DEB_URL=https://github.com/ethcore/parity/releases/download/v1.2.1/parity_linux_1.2.1-0_amd64.deb
|
||||||
|
|
||||||
|
|
||||||
function run_installer()
|
function run_installer()
|
||||||
|
Loading…
Reference in New Issue
Block a user