Merge branch 'master' into txqueue

.gitlab-ci.yml

@@ -1,7 +1,6 @@
 stages:
   - build
   - test
-  - deploy
 variables:
   GIT_DEPTH: "3"
   SIMPLECOV: "true" 
@@ -30,6 +29,27 @@ linux-stable:
     paths:
     - target/release/parity
     name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-stable-14.04:
+  stage: build
+  image: ethcore/rust-14.04:latest
+  only:
+    - master
+    - beta
+    - tags
+    - stable
+  script:
+    - cargo build --release --verbose
+    - strip target/release/parity
+    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_secret_access_key $s3_secret
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/parity --body target/release/parity
+  tags:
+    - rust
+    - rust-14.04
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "stable-x86_64-unknown-ubuntu_14_04-gnu_parity"
 linux-beta:
   stage: build
   image: ethcore/rust:beta
@@ -83,14 +103,14 @@ linux-centos:
     - strip target/release/parity
     - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-centos-linux-gnu/parity --body target/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
   tags:
     - rust
     - rust-centos
   artifacts:
     paths:
     - target/release/parity
-    name: "centos-x86_64-unknown-linux-gnu_parity"
+    name: "x86_64-unknown-centos-gnu_parity"
 linux-armv7:
   stage: build
   image: ethcore/rust-armv7:latest
@@ -109,13 +129,13 @@ linux-armv7:
     - arm-linux-gnueabihf-strip target/armv7-unknown-linux-gnueabihf/release/parity
     - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/armv7-unknown-linux-gnueabihf/release/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/release/parity
+    - target/armv7-unknown-linux-gnueabihf/release/parity
     name: "armv7_unknown_linux_gnueabihf_parity"
   allow_failure: true
 linux-arm:
@@ -136,13 +156,13 @@ linux-arm:
     - arm-linux-gnueabihf-strip target/arm-unknown-linux-gnueabihf/release/parity
     - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/arm-unknown-linux-gnueabihf/release/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/release/parity
+    - target/arm-unknown-linux-gnueabihf/release/parity
     name: "arm-unknown-linux-gnueabihf_parity"
   allow_failure: true
 linux-armv6:
@@ -163,13 +183,13 @@ linux-armv6:
     - arm-linux-gnueabi-strip target/arm-unknown-linux-gnueabi/release/parity
     - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/arm-unknown-linux-gnueabi/release/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/release/parity
+    - target/arm-unknown-linux-gnueabi/release/parity
     name: "arm-unknown-linux-gnueabi_parity"
   allow_failure: true
 linux-aarch64:
@@ -190,13 +210,13 @@ linux-aarch64:
     - aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/parity
     - aws configure set aws_access_key_id $s3_key 
     - aws configure set aws_secret_access_key $s3_secret
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/release/parity
+    - target/aarch64-unknown-linux-gnu/release/parity
     name: "aarch64-unknown-linux-gnu_parity"
   allow_failure: true
 darwin:
@@ -230,9 +250,10 @@ windows:
     - set RUST_BACKTRACE=1
     - rustup default stable-x86_64-pc-windows-msvc
     - cargo build --release --verbose
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id %s3_key%
-    - aws configure set aws_secret_access_key $s3_secret
+    - aws configure set aws_secret_access_key %s3_secret%
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-pc-windows-msvc/parity --body target/release/parity.exe
+    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity --body target/release/parity.exe
+    - aws s3api put-object --bucket builds-parity --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity --body target/release/parity.pdb
   tags:
    - rust-windows
   artifacts:
@@ -250,12 +271,3 @@ test-linux:
     - rust-test
   dependencies:
     - linux-stable
-#deploy-binaries:
-#  stage: deploy
-#  only:
-#    - master
-#    - beta
-#    - tags
-#    - stable
-#  script:
-#    - scripts/deploy.sh