From 2245863f047761e01c445d8a9d2a402e1b2120cc Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Thu, 27 Apr 2017 16:14:51 +0300 Subject: [PATCH 1/9] add snap to CI initial build snap package for parity --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c2ad13d6..99dd7c11b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,20 @@ linux-stable: - target/release/ethstore - target/release/ethkey name: "stable-x86_64-unknown-linux-gnu_parity" +linux-snap: + stage: build + only: + - snap + script: + - git clone https://github.com/paritytech/parity + - git submodule update --init --recursive + - cd scripts + - snapcraft + - sudo snap install *.snap --dangerous + - parity -v + tags: + - snap + allow_failure: true linux-stable-debian: stage: build image: ethcore/rust-debian:latest From 011f6102a5416ae8b18d8d82c3acd0f6d8b2948d Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Thu, 27 Apr 2017 16:27:28 +0300 Subject: [PATCH 2/9] update gitlab-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99dd7c11b..6c996d87c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ linux-snap: only: - snap script: - - git clone https://github.com/paritytech/parity + #- git clone https://github.com/paritytech/parity - git submodule update --init --recursive - cd scripts - snapcraft From e439b53652f01a200b25524a06776bee3039f7ea Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Thu, 27 Apr 2017 17:20:00 +0300 Subject: [PATCH 3/9] switch to docker runner --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c996d87c..ebd8cd900 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,17 +62,20 @@ linux-stable: name: "stable-x86_64-unknown-linux-gnu_parity" linux-snap: stage: build + image: ubuntu:latest only: - snap + before_script: + - apt install snapcraft script: - #- git clone https://github.com/paritytech/parity - git submodule update --init --recursive - cd scripts - snapcraft - sudo snap install *.snap --dangerous - parity -v tags: - - snap + - rust + - rust-stable allow_failure: true linux-stable-debian: stage: build From e989e2f12c510b0911c68d9f51af79703086e03f Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 28 Apr 2017 15:16:40 +0300 Subject: [PATCH 4/9] add artifacts for snap --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebd8cd900..55e1e51de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,21 +62,20 @@ linux-stable: name: "stable-x86_64-unknown-linux-gnu_parity" linux-snap: stage: build - image: ubuntu:latest + image: ethcore/snapcraft:latest only: - snap - before_script: - - apt install snapcraft script: - - git submodule update --init --recursive - cd scripts - snapcraft - - sudo snap install *.snap --dangerous - - parity -v tags: - rust - rust-stable + artifacts: + paths: + - parity*.snap allow_failure: true + name: "stable-x86_64-unknown-linux-gnu_parity-snap" linux-stable-debian: stage: build image: ethcore/rust-debian:latest From a1aaead6a946b580e78f5c8782e977136271e87e Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 28 Apr 2017 15:19:10 +0300 Subject: [PATCH 5/9] fix CI lint --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55e1e51de..a2ee51c20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,8 +74,8 @@ linux-snap: artifacts: paths: - parity*.snap + name: "stable-x86_64-unknown-linux-gnu_parity-snap" allow_failure: true - name: "stable-x86_64-unknown-linux-gnu_parity-snap" linux-stable-debian: stage: build image: ethcore/rust-debian:latest From e9ebb2498b9649e724e471f03aa52e926b94b6ce Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 28 Apr 2017 15:52:58 +0300 Subject: [PATCH 6/9] parity_master_amd64.snap --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2ee51c20..88dcf4b54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ linux-snap: - rust-stable artifacts: paths: - - parity*.snap + - parity_master_amd64.snap name: "stable-x86_64-unknown-linux-gnu_parity-snap" allow_failure: true linux-stable-debian: From 2ecdf111b0e9ca5190fbd52bab02555730c07355 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 28 Apr 2017 16:45:59 +0300 Subject: [PATCH 7/9] fix path to artefacts --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88dcf4b54..7f4396b3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,7 @@ linux-snap: only: - snap script: + - rm -rf *snap - cd scripts - snapcraft tags: @@ -73,7 +74,7 @@ linux-snap: - rust-stable artifacts: paths: - - parity_master_amd64.snap + - scripts/parity_master_amd64.snap name: "stable-x86_64-unknown-linux-gnu_parity-snap" allow_failure: true linux-stable-debian: From 09bd3a9642e8587cf12b207cd3f06d871ea3c0c0 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Tue, 2 May 2017 20:45:19 +0300 Subject: [PATCH 8/9] update CI docker images switch to hub.docker.com/r/parity --- .gitlab-ci.yml | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f4396b3d..7ddc58c9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,26 +60,9 @@ linux-stable: - target/release/ethstore - target/release/ethkey name: "stable-x86_64-unknown-linux-gnu_parity" -linux-snap: - stage: build - image: ethcore/snapcraft:latest - only: - - snap - script: - - rm -rf *snap - - cd scripts - - snapcraft - tags: - - rust - - rust-stable - artifacts: - paths: - - scripts/parity_master_amd64.snap - name: "stable-x86_64-unknown-linux-gnu_parity-snap" - allow_failure: true linux-stable-debian: stage: build - image: ethcore/rust-debian:latest + image: parity/rust-debian:gitlab-ci only: - beta - tags @@ -163,7 +146,7 @@ linux-nightly: allow_failure: true linux-centos: stage: build - image: ethcore/rust-centos:latest + image: parity/rust-centos:gitlab-ci only: - beta - tags @@ -194,7 +177,7 @@ linux-centos: name: "x86_64-unknown-centos-gnu_parity" linux-i686: stage: build - image: ethcore/rust-i686:latest + image: parity/rust-i686:gitlab-ci only: - beta - tags @@ -234,7 +217,7 @@ linux-i686: allow_failure: true linux-armv7: stage: build - image: ethcore/rust-armv7:latest + image: parity/rust-armv7:gitlab-ci only: - beta - tags @@ -280,7 +263,7 @@ linux-armv7: allow_failure: true linux-arm: stage: build - image: ethcore/rust-arm:latest + image: parity/rust-arm:gitlab-ci only: - beta - tags @@ -365,7 +348,7 @@ linux-armv6: allow_failure: true linux-aarch64: stage: build - image: ethcore/rust-aarch64:latest + image: parity/rust-arm64:latest only: - beta - tags @@ -577,7 +560,7 @@ test-rust-stable: - rust-stable js-test: stage: test - image: ethcore/rust:stable + image: parity/rust:gitlab-ci before_script: - git submodule update --init --recursive - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l) @@ -591,11 +574,12 @@ test-rust-beta: stage: test only: - triggers - image: ethcore/rust:beta + image: parity/rust:gitlab-ci before_script: - git submodule update --init --recursive - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l) script: + - rustup default beta - export RUST_BACKTRACE=1 - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi tags: @@ -606,11 +590,12 @@ test-rust-nightly: stage: test only: - triggers - image: ethcore/rust:nightly + image: parity/rust:gitlab-ci before_script: - git submodule update --init --recursive - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l) script: + - rustup default stable - export RUST_BACKTRACE=1 - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi tags: @@ -624,12 +609,13 @@ js-release: - beta - stable - tags - image: ethcore/rust:stable + image: parity/rust:gitlab-ci before_script: - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l) - echo $JS_FILES_MODIFIED - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi script: + - rustup default stable - echo $JS_FILES_MODIFIED - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi tags: @@ -638,8 +624,9 @@ push-release: stage: push-release only: - tags - image: ethcore/rust:stable + image: parity/rust:gitlab-ci script: + - rustup default stable - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF tags: From 9cfb50f90fc995045279e059eb17cdfe64e3b507 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Wed, 3 May 2017 03:12:45 +0300 Subject: [PATCH 9/9] Update .gitlab-ci.yml build snap beta --- .gitlab-ci.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ddc58c9b..6688d6f23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,24 @@ linux-stable: - target/release/ethstore - target/release/ethkey name: "stable-x86_64-unknown-linux-gnu_parity" +linux-snap: + stage: build + image: parity/snapcraft:gitlab-ci + only: + - snap + - beta + script: + - rm -rf *snap + - cd scripts + - snapcraft + tags: + - rust + - rust-stable + artifacts: + paths: + - scripts/parity_master_amd64.snap + name: "stable-x86_64-unknown-linux-gnu_parity-snap" + allow_failure: true linux-stable-debian: stage: build image: parity/rust-debian:gitlab-ci @@ -348,7 +366,7 @@ linux-armv6: allow_failure: true linux-aarch64: stage: build - image: parity/rust-arm64:latest + image: parity/rust-arm64:gitlab-ci only: - beta - tags