diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-02-11 14:43:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 14:43:34 +0000 |
| commit | bb98c593a5df890341cddfda528dc9952df728a4 (patch) | |
| tree | 85929195dcbc07305b46174feb2f9f4133f56e4c | |
| parent | Remove deprecated user_may_create_room_with_invites callback (#11950) (diff) | |
| download | synapse-bb98c593a5df890341cddfda528dc9952df728a4.tar.xz | |
Prepare for rename of default complement branch (#11971)
use `HEAD` rather than hardcoding `master`
| -rw-r--r-- | .github/workflows/tests.yml | 6 | ||||
| -rw-r--r-- | changelog.d/11971.misc | 1 |
2 files changed, 4 insertions, 3 deletions
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. |