From b7edf41079c74dda47b6ce03959c2b9b66cc41da Mon Sep 17 00:00:00 2001 From: ddorgan Date: Fri, 28 Sep 2018 18:52:15 +0100 Subject: [PATCH] Test fix for windows cache name... (#9658) * Test fix for windows cache name... * Fix variable name. --- .gitlab-ci.yml | 100 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13b1c0146b9..509ef126244 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,32 +49,75 @@ 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 -.optional_test: &optional_test - <<: *test - allow_failure: true - only: - - master - -test-rust-beta: - <<: *optional_test +test-linux-rust-beta: + stage: test script: - scripts/gitlab/test.sh beta + tags: + - rust-stable + allow_failure: true -test-rust-nightly: - <<: *optional_test +test-linux-rust-nightly: + stage: test script: - scripts/gitlab/test.sh nightly + tags: + - rust-stable + allow_failure: true + +test-darwin-rust-stable: + stage: test + variables: + CARGO_TARGET: x86_64-apple-darwin + CC: gcc + CXX: g++ + script: + - scripts/gitlab/test.sh stable + tags: + - osx + allow_failure: true + +test-android-rust-stable: + stage: test + image: parity/rust-android:gitlab-ci + variables: + CARGO_TARGET: armv7-linux-androideabi + script: + - scripts/gitlab/test.sh stable + tags: + - rust-arm + allow_failure: true + +test-windows-rust-stable: + stage: test + cache: + key: "${CI_JOB_NAME}" + paths: + - "%CI_PROJECT_DIR%/target/" + - "%CI_PROJECT_DIR%/cargo/" + # No cargo caching, since fetch-locking on Windows gets stuck + variables: + CARGO_TARGET: x86_64-pc-windows-msvc + script: + - sh scripts/gitlab/test.sh stable + tags: + - rust-windows + allow_failure: true + +.optional_test: &optional_test + <<: *test + allow_failure: true + only: + - master test-lint-rustfmt: <<: *optional_test @@ -87,15 +130,11 @@ test-lint-clippy: - scripts/gitlab/clippy.sh test-coverage-kcov: - stage: test - only: - - master + <<: *optional_test script: - scripts/gitlab/coverage.sh tags: - shell - allow_failure: true - #### stage: build @@ -109,46 +148,58 @@ build-linux-ubuntu-amd64: &build <<: *collect_artifacts tags: - rust-stable - allow_failure: true build-linux-ubuntu-i386: <<: *build + only: *releaseable_branches image: parity/rust-i686:gitlab-ci variables: CARGO_TARGET: i686-unknown-linux-gnu tags: - rust-i686 + allow_failure: true build-linux-ubuntu-arm64: <<: *build + only: *releaseable_branches image: parity/rust-arm64:gitlab-ci variables: CARGO_TARGET: aarch64-unknown-linux-gnu tags: - rust-arm + allow_failure: true build-linux-ubuntu-armhf: <<: *build + only: *releaseable_branches image: parity/rust-armv7:gitlab-ci variables: CARGO_TARGET: armv7-unknown-linux-gnueabihf tags: - rust-arm + allow_failure: true build-linux-android-armhf: - <<: *build + stage: build + only: *releaseable_branches image: parity/rust-android:gitlab-ci variables: CARGO_TARGET: armv7-linux-androideabi + script: + - scripts/gitlab/build-unix.sh tags: - rust-arm + allow_failure: true build-darwin-macos-x86_64: - <<: *build + stage: build + only: *releaseable_branches variables: CARGO_TARGET: x86_64-apple-darwin CC: gcc CXX: g++ + script: + - scripts/gitlab/build-unix.sh tags: - osx <<: *collect_artifacts @@ -157,7 +208,7 @@ build-windows-msvc-x86_64: stage: build only: *releaseable_branches cache: - key: "%CI_JOB_NAME%" + key: "${CI_JOB_NAME}" paths: - "%CI_PROJECT_DIR%/target/" - "%CI_PROJECT_DIR%/cargo/" @@ -170,7 +221,6 @@ build-windows-msvc-x86_64: - rust-windows <<: *collect_artifacts - #### stage: package package-linux-snap-amd64: &package_snap @@ -215,7 +265,6 @@ package-linux-snap-armhf: dependencies: - build-linux-ubuntu-armhf - #### stage: publish publish-linux-snap-amd64: &publish_snap @@ -262,7 +311,6 @@ publish-docker-parity-amd64: &publish_docker - build-linux-ubuntu-amd64 tags: - shell - allow_failure: true script: - scripts/gitlab/publish-docker.sh parity @@ -287,8 +335,6 @@ publish-github-and-s3: - scripts/gitlab/push.sh tags: - shell - allow_failure: true - ####stage: docs