From c8fb84337a03c36393402c0ad3bbaf852fd7b266 Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 1 Dec 2020 19:15:48 +0100 Subject: [PATCH 1/2] CI: put image name into a var so it can be changed by a upstream pipeline trigger --- .gitlab-ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00b82e4f..b9815dd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,11 +16,7 @@ variables: CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}" CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}" RUST_LIB_BACKTRACE: "0" - -# Necessary for building binaryen-sys, which is part of the binaryen dependency. -# Should be reverted once the `cargo-contract` ci image provides a clang version -# for which building `binaryen-sys` works (paritytech/scripts/#237). - CXX: "/usr/bin/clang++-8" + CI_IMAGE: "paritytech/contracts-ci-linux:production" workflow: rules: @@ -36,7 +32,7 @@ workflow: - artifacts/ .docker-env: &docker-env - image: paritytech/contracts-ci-linux:latest + image: "${CI_IMAGE}" before_script: - cargo -vV - rustc -vV @@ -52,7 +48,6 @@ workflow: - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_COMMIT_REF_NAME == "master" - if: $CI_COMMIT_REF_NAME == "tags" - - if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 dependencies: [] -- GitLab From bc5ba0ba16db415de337d8e1fb286e9d7e2b59f4 Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 2 Dec 2020 12:07:59 +0100 Subject: [PATCH 2/2] CI: explanation for the ancestors --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9815dd8..6f20beeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,8 @@ variables: CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}" CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}" RUST_LIB_BACKTRACE: "0" + # this var is changed to "-:staging" when the CI image gets rebuilt + # read more https://github.com/paritytech/cargo-contract/pull/115 CI_IMAGE: "paritytech/contracts-ci-linux:production" workflow: -- GitLab