From 93165bc4d2479b2affecdbe8838b5a3ae0163540 Mon Sep 17 00:00:00 2001
From: Vladimir Istyufeev <vladimir@parity.io>
Date: Thu, 4 May 2023 14:32:16 +0400
Subject: [PATCH] CI: `cargo-check-benches`: don't merge in `master` if base
ref isn't `master` (#14071)
---
substrate/scripts/ci/gitlab/pipeline/test.yml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/substrate/scripts/ci/gitlab/pipeline/test.yml b/substrate/scripts/ci/gitlab/pipeline/test.yml
index 82f024d35e6..ecfcf9ff332 100644
--- a/substrate/scripts/ci/gitlab/pipeline/test.yml
+++ b/substrate/scripts/ci/gitlab/pipeline/test.yml
@@ -88,13 +88,17 @@ cargo-check-benches:
- !reference [.job-switcher, before_script]
- !reference [.rusty-cachier, before_script]
- !reference [.pipeline-stopper-vars, script]
- # merges in the master branch on PRs
+ # merges in the master branch on PRs. skip if base is not master
- 'if [ $CI_COMMIT_REF_NAME != "master" ]; then
- BASE=$(curl -s -H "Authorization: Bearer ${GITHUB_PR_TOKEN}" https://api.github.com/repos/paritytech/substrate/pulls/${CI_COMMIT_REF_NAME} | jq -r .base.ref);
- printf "Merging base branch %s\n" "${BASE:=master}";
- git config user.email "ci@gitlab.parity.io";
- git fetch origin "refs/heads/${BASE}";
- git merge --verbose --no-edit FETCH_HEAD;
+ BASE=$(curl -s -H "Authorization: Bearer ${GITHUB_PR_TOKEN}" https://api.github.com/repos/paritytech/substrate/pulls/${CI_COMMIT_REF_NAME} | jq -r .base.ref);
+ printf "Merging base branch %s\n" "${BASE:=master}";
+ if [ $BASE != "master" ]; then
+ echo "$BASE is not master, skipping merge";
+ else
+ git config user.email "ci@gitlab.parity.io";
+ git fetch origin "refs/heads/${BASE}";
+ git merge --verbose --no-edit FETCH_HEAD;
+ fi
fi'
parallel: 2
script:
--
GitLab