From cfcc579bb712e158309e9689448617061d188aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 2 Dec 2021 16:34:44 +0100 Subject: [PATCH 1/4] Fix cumulus companion checks --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1987b834fef0..701bbcfe9e34b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -606,6 +606,7 @@ cargo-check-macos: --substrate "$DEPENDENT_REPO" "$GITHUB_PR_TOKEN" + $CARGO_UPDATE_CRATES # Individual jobs are set up for each dependent project so that they can be ran in parallel. # Arguably we could generate a job for each companion in the PR's description using Gitlab's @@ -620,6 +621,7 @@ check-dependent-cumulus: <<: *check-dependent-project variables: DEPENDENT_REPO: cumulus + CARGO_UPDATE_CRATES: "sp-io polkadot-runtime-common" build-linux-substrate: From 9f8f3c82a284fc3919753d0f44f0d2485f94b680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 3 Dec 2021 11:48:38 +0100 Subject: [PATCH 2/4] Add missing tag --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 701bbcfe9e34b..3de136b31c37e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,6 +46,7 @@ variables: &default-vars VAULT_AUTH_PATH: "gitlab-parity-io-jwt" VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}" SIMNET_FEATURES_PATH: "simnet_tests/tests" + PIPELINE_SCRIPTS_TAG: "v0.4" default: cache: {} From 4318962a0d231040beff3faeecff09e2e313a837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 3 Dec 2021 14:08:46 +0100 Subject: [PATCH 3/4] Fix --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3de136b31c37e..248b6e0de270f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -617,6 +617,7 @@ check-dependent-polkadot: <<: *check-dependent-project variables: DEPENDENT_REPO: polkadot + CARGO_UPDATE_CRATES: "sp-io" check-dependent-cumulus: <<: *check-dependent-project From 0182a1ddf90cd7bf513c8469015814e05e33c09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 3 Dec 2021 15:05:46 +0100 Subject: [PATCH 4/4] Update .gitlab-ci.yml Co-authored-by: Denis Pisarev <17856421+TriplEight@users.noreply.github.com> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 248b6e0de270f..f4391cf7d312c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -607,7 +607,7 @@ cargo-check-macos: --substrate "$DEPENDENT_REPO" "$GITHUB_PR_TOKEN" - $CARGO_UPDATE_CRATES + "$CARGO_UPDATE_CRATES" # Individual jobs are set up for each dependent project so that they can be ran in parallel. # Arguably we could generate a job for each companion in the PR's description using Gitlab's