From a311d4c735638b927ff5f52633b377f4c0048e57 Mon Sep 17 00:00:00 2001 From: gabriel Date: Fri, 14 Sep 2018 18:30:25 +0200 Subject: [PATCH 1/4] while working on the platform tests make them non-critical --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e1de5f20a4..89553f3382a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,7 @@ test-darwin-macos-x86_64: - scripts/gitlab/test.sh stable tags: - osx + allow_failure: true test-linux-android-armhf: stage: test @@ -80,6 +81,7 @@ test-linux-android-armhf: - scripts/gitlab/test.sh stable tags: - rust-arm + allow_failure: true test-windows-msvc-x86_64: stage: test @@ -95,6 +97,7 @@ test-windows-msvc-x86_64: - sh scripts/gitlab/test.sh stable tags: - rust-windows + allow_failure: true From 5bf8b370eda85bc801dfe4d742d860bdde3b37e8 Mon Sep 17 00:00:00 2001 From: 5chdn <5chdn@users.noreply.github.com> Date: Fri, 14 Sep 2018 22:08:08 +0200 Subject: [PATCH 2/4] ci: unify test stage job names and torelate more failures --- .gitlab-ci.yml | 52 ++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89553f3382a..d5a7e4fe39e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,18 +49,30 @@ cache: - export VERSION - echo "Version = ${VERSION}" - - #### stage: test -test-rust-stable: &test +test-linux-rust-stable: &test stage: test script: - scripts/gitlab/test.sh stable tags: - rust-stable -test-darwin-macos-x86_64: +test-linux-rust-beta: + stage: test + script: + - scripts/gitlab/test.sh beta + tags: + - rust-stable + +test-linux-rust-nightly: + stage: test + script: + - scripts/gitlab/test.sh nightly + tags: + - rust-stable + +test-darwin-rust-stable: stage: test variables: CARGO_TARGET: x86_64-apple-darwin @@ -72,7 +84,7 @@ test-darwin-macos-x86_64: - osx allow_failure: true -test-linux-android-armhf: +test-android-rust-stable: stage: test image: parity/rust-android:gitlab-ci variables: @@ -83,7 +95,7 @@ test-linux-android-armhf: - rust-arm allow_failure: true -test-windows-msvc-x86_64: +test-windows-rust-stable: stage: test cache: key: "%CI_JOB_NAME%" @@ -99,26 +111,12 @@ test-windows-msvc-x86_64: - rust-windows allow_failure: true - - - - .optional_test: &optional_test <<: *test allow_failure: true only: - master -test-rust-beta: - <<: *optional_test - script: - - scripts/gitlab/test.sh beta - -test-rust-nightly: - <<: *optional_test - script: - - scripts/gitlab/test.sh nightly - test-lint-rustfmt: <<: *optional_test script: @@ -130,15 +128,10 @@ test-lint-clippy: - scripts/gitlab/clippy.sh test-coverage-kcov: - stage: test - only: - - master - script: + <<: *optional_test - scripts/gitlab/coverage.sh tags: - shell - allow_failure: true - #### stage: build @@ -161,6 +154,7 @@ build-linux-ubuntu-i386: CARGO_TARGET: i686-unknown-linux-gnu tags: - rust-i686 + allow_failure: true build-linux-ubuntu-arm64: <<: *build @@ -170,6 +164,7 @@ build-linux-ubuntu-arm64: CARGO_TARGET: aarch64-unknown-linux-gnu tags: - rust-arm + allow_failure: true build-linux-ubuntu-armhf: <<: *build @@ -179,6 +174,7 @@ build-linux-ubuntu-armhf: CARGO_TARGET: armv7-unknown-linux-gnueabihf tags: - rust-arm + allow_failure: true build-linux-android-armhf: stage: build @@ -190,6 +186,7 @@ build-linux-android-armhf: - scripts/gitlab/build-unix.sh tags: - rust-arm + allow_failure: true build-darwin-macos-x86_64: stage: build @@ -221,7 +218,6 @@ build-windows-msvc-x86_64: - rust-windows <<: *collect_artifacts - #### stage: package package-linux-snap-amd64: &package_snap @@ -263,7 +259,6 @@ package-linux-snap-armhf: dependencies: - build-linux-ubuntu-armhf - #### stage: publish publish-linux-snap-amd64: &publish_snap @@ -335,7 +330,6 @@ publish-github-and-s3: tags: - shell - ####stage: docs docs-rpc-json: From d23243b7b0c12c9377f12987f1ce384619040629 Mon Sep 17 00:00:00 2001 From: 5chdn <5chdn@users.noreply.github.com> Date: Fri, 14 Sep 2018 22:14:17 +0200 Subject: [PATCH 3/4] ci: restore valid yaml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5a7e4fe39e..ad920fd9254 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,6 +129,7 @@ test-lint-clippy: test-coverage-kcov: <<: *optional_test + script: - scripts/gitlab/coverage.sh tags: - shell From 37ecb0ec838e0316293aa697c016fb610e724b82 Mon Sep 17 00:00:00 2001 From: 5chdn <5chdn@users.noreply.github.com> Date: Sat, 15 Sep 2018 13:38:56 +0200 Subject: [PATCH 4/4] ci: allow beta and nightly rust builds to fail --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad920fd9254..8c794fd6c50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,7 @@ test-linux-rust-beta: - scripts/gitlab/test.sh beta tags: - rust-stable + allow_failure: true test-linux-rust-nightly: stage: test @@ -71,6 +72,7 @@ test-linux-rust-nightly: - scripts/gitlab/test.sh nightly tags: - rust-stable + allow_failure: true test-darwin-rust-stable: stage: test