From e1312a3d8b1205882847b975ac64be64985e6e5d Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Mon, 5 Feb 2024 09:18:36 +0000
Subject: [PATCH] Issue #3418207 followup by longwave, fjgarlin: Spell-checking
job fails with "couldn't find remote ref refs/heads/11.x" when 11.x branch
does not exist in fork
---
.gitlab-ci.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d7d900ce5eb..b6b1cd80d36d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -411,4 +411,9 @@ default:
variables:
KUBERNETES_CPU_REQUEST: "2"
script:
- - git diff $CI_MERGE_REQUEST_TARGET_BRANCH_SHA --name-only | sed "s_^_../_" | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin
+ - if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then
+ echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_TARGET_BRANCH_SHA is ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA}";
+ else
+ echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_DIFF_BASE_SHA is ${CI_MERGE_REQUEST_DIFF_BASE_SHA}";
+ fi;
+ - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin
--
GitLab