From dfff2ea69355ef87148776869ccd6926228ea542 Mon Sep 17 00:00:00 2001 From: Alexander Grund <Flamefire@users.noreply.github.com> Date: Wed, 23 Jun 2021 16:18:08 +0200 Subject: [PATCH] Use origin/$CI_ See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/4078 --- doc.zih.tu-dresden.de/util/check-links.sh | 6 +++--- doc.zih.tu-dresden.de/util/lint-changes.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc.zih.tu-dresden.de/util/check-links.sh b/doc.zih.tu-dresden.de/util/check-links.sh index f3da54593..1025f65bc 100755 --- a/doc.zih.tu-dresden.de/util/check-links.sh +++ b/doc.zih.tu-dresden.de/util/check-links.sh @@ -34,9 +34,9 @@ fi echo "mlc: $mlc" -branch="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-}" -if [ -z "$branch" ]; then - branch="preview" +branch="preview" +if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then + branch="origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" fi any_fails=false diff --git a/doc.zih.tu-dresden.de/util/lint-changes.sh b/doc.zih.tu-dresden.de/util/lint-changes.sh index 5a4872b85..4afb1a016 100755 --- a/doc.zih.tu-dresden.de/util/lint-changes.sh +++ b/doc.zih.tu-dresden.de/util/lint-changes.sh @@ -2,9 +2,9 @@ set -euo pipefail -branch="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-}" -if [ -z "$branch" ]; then - branch="preview" +branch="preview" +if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then + branch="origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" fi any_fails=false -- GitLab