OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepare for rename of default complement branch (#11971) 

use `HEAD` rather than hardcoding `master`
anoa/rooms_for_as_edu_handler
Richard van der Hoff 2022-02-11 14:43:34 +00:00 committed by GitHub
parent 0171fa5226
commit bb98c593a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/tests.yml vendored
View File

@ -345,7 +345,7 @@ jobs:
path: synapse path: synapse
# Attempt to check out the same branch of Complement as the PR. If it # 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 - name: Checkout complement
shell: bash shell: bash
run: | run: |
@ -358,8 +358,8 @@ jobs:
# for pull requests, otherwise GITHUB_REF). # for pull requests, otherwise GITHUB_REF).
# 2. Attempt to use the base branch, e.g. when merging into release-vX.Y # 2. Attempt to use the base branch, e.g. when merging into release-vX.Y
# (GITHUB_BASE_REF for pull requests). # (GITHUB_BASE_REF for pull requests).
# 3. Use the default complement branch ("master"). # 3. Use the default complement branch ("HEAD").
for BRANCH_NAME in "$GITHUB_HEAD_REF" "$GITHUB_BASE_REF" "${GITHUB_REF#refs/heads/}" "master"; do for BRANCH_NAME in "$GITHUB_HEAD_REF" "$GITHUB_BASE_REF" "${GITHUB_REF#refs/heads/}" "HEAD"; do
# Skip empty branch names and merge commits. # Skip empty branch names and merge commits.
if [[ -z "$BRANCH_NAME" || $BRANCH_NAME =~ ^refs/pull/.* ]]; then if [[ -z "$BRANCH_NAME" || $BRANCH_NAME =~ ^refs/pull/.* ]]; then
continue continue

1
changelog.d/11971.misc Normal file
View File

@ -0,0 +1 @@
Prepare for rename of default complement branch.