From bb98c593a5df890341cddfda528dc9952df728a4 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 11 Feb 2022 14:43:34 +0000
Subject: [PATCH] Prepare for rename of default complement branch (#11971)
use `HEAD` rather than hardcoding `master`
---
.github/workflows/tests.yml | 6 +++---
changelog.d/11971.misc | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 changelog.d/11971.misc
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c395f3e1c2..75ac1304bf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -345,7 +345,7 @@ jobs:
path: synapse
# Attempt to check out the same branch of Complement as the PR. If it
- # doesn't exist, fallback to master.
+ # doesn't exist, fallback to HEAD.
- name: Checkout complement
shell: bash
run: |
@@ -358,8 +358,8 @@ jobs:
# for pull requests, otherwise GITHUB_REF).
# 2. Attempt to use the base branch, e.g. when merging into release-vX.Y
# (GITHUB_BASE_REF for pull requests).
- # 3. Use the default complement branch ("master").
- for BRANCH_NAME in "$GITHUB_HEAD_REF" "$GITHUB_BASE_REF" "${GITHUB_REF#refs/heads/}" "master"; do
+ # 3. Use the default complement branch ("HEAD").
+ for BRANCH_NAME in "$GITHUB_HEAD_REF" "$GITHUB_BASE_REF" "${GITHUB_REF#refs/heads/}" "HEAD"; do
# Skip empty branch names and merge commits.
if [[ -z "$BRANCH_NAME" || $BRANCH_NAME =~ ^refs/pull/.* ]]; then
continue
diff --git a/changelog.d/11971.misc b/changelog.d/11971.misc
new file mode 100644
index 0000000000..4e5bd8a393
--- /dev/null
+++ b/changelog.d/11971.misc
@@ -0,0 +1 @@
+Prepare for rename of default complement branch.
--
GitLab