Merge remote-tracking branch 'origin/work-notify' into beta

openethereum · Jul 1, 2016 · a600b1a · a600b1a
2 parents df04c95 + 1ce3fc2
commit a600b1a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
@@ -20,6 +20,8 @@ g++ -v
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
 	cd parity&&\
+	git checkout beta && \
+        git pull && \
         ls -a&&\
         cargo build --release --verbose && \
 	ls /build/parity/target/release/parity &&	\

diff --git a/docker/ubuntu-aarch64/Dockerfile b/docker/ubuntu-aarch64/Dockerfile
@@ -36,6 +36,8 @@ ENV CC aarch64-linux-gnu-gcc
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
         cd parity && \
+        git checkout beta && \
+        git pull && \
         mkdir -p .cargo && \
         echo '[target.aarch64-unknown-linux-gnu]\n\
         linker = "aarch64-linux-gnu-gcc"\n'\

diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile
@@ -36,6 +36,8 @@ ENV CC arm-linux-gnueabihf-gcc
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
         cd parity && \
+        git checkout beta && \
+        git pull && \
         mkdir -p .cargo && \
         echo '[target.armv7-unknown-linux-gnueabihf]\n\
         linker = "arm-linux-gnueabihf-gcc"\n'\

diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile
@@ -47,6 +47,8 @@ g++ -v
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
         cd parity && \
+        git checkout beta && \
+        git pull && \
         cargo build --release --features ethcore/jit --verbose && \
         ls /build/parity/target/release/parity &&       \
         strip /build/parity/target/release/parity

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -27,7 +27,9 @@ g++ -v
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
         cd parity && \
+        git checkout beta && \
+        git pull && \
         cargo build --release --verbose && \
-        ls /build/parity/target/release/parity &&       \
+        ls /build/parity/target/release/parity && \
         strip /build/parity/target/release/parity
 RUN file /build/parity/target/release/parity
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
@@ -266,7 +266,7 @@ impl Miner {
 				let is_new = original_work_hash.map_or(true, |h| block.block().fields().header.hash() != h);
 				sealing_work.push(block);
 				// 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();
 				}
 				(Some((pow_hash, difficulty, number)), is_new)

diff --git a/install-parity.sh b/install-parity.sh
@@ -1,6 +1,6 @@
 #!/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()