From 48812cf4bc54e30a42a0b483d2727ee8957958e4 Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Thu, 8 Dec 2022 18:57:27 +0300 Subject: [PATCH 1/3] Checkout to the branch HEAD explicitly in `build-linux-substrate` --- scripts/ci/gitlab/pipeline/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci/gitlab/pipeline/build.yml b/scripts/ci/gitlab/pipeline/build.yml index 5bbc3fb8f751c..db2e9c656bedf 100644 --- a/scripts/ci/gitlab/pipeline/build.yml +++ b/scripts/ci/gitlab/pipeline/build.yml @@ -64,6 +64,9 @@ build-linux-substrate: before_script: - mkdir -p ./artifacts/substrate/ - !reference [.rusty-cachier, before_script] + # tldr: we need to checkout to the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary + # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589 + - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA" script: - rusty-cachier snapshot create - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release --verbose From 9ec59d64530ec2270695d8ee95685bfbf7b85b72 Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Thu, 8 Dec 2022 18:59:12 +0300 Subject: [PATCH 2/3] Fix typo --- scripts/ci/gitlab/pipeline/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/build.yml b/scripts/ci/gitlab/pipeline/build.yml index db2e9c656bedf..e0081149531b7 100644 --- a/scripts/ci/gitlab/pipeline/build.yml +++ b/scripts/ci/gitlab/pipeline/build.yml @@ -64,7 +64,7 @@ build-linux-substrate: before_script: - mkdir -p ./artifacts/substrate/ - !reference [.rusty-cachier, before_script] - # tldr: we need to checkout to the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary + # tldr: we need checkout to the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589 - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA" script: From 635cba566ed2d694f06dc131b9ada30198ebed22 Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Thu, 8 Dec 2022 19:00:45 +0300 Subject: [PATCH 3/3] Fix typo --- scripts/ci/gitlab/pipeline/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/build.yml b/scripts/ci/gitlab/pipeline/build.yml index e0081149531b7..2f8cff7b3ffa6 100644 --- a/scripts/ci/gitlab/pipeline/build.yml +++ b/scripts/ci/gitlab/pipeline/build.yml @@ -64,7 +64,7 @@ build-linux-substrate: before_script: - mkdir -p ./artifacts/substrate/ - !reference [.rusty-cachier, before_script] - # tldr: we need checkout to the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary + # tldr: we need to checkout the branch HEAD explicitly because of our dynamic versioning approach while building the substrate binary # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589 - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA" script: