diff options
| author | Erik Johnston <erik@matrix.org> | 2022-02-22 12:26:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2022-02-22 12:26:17 +0000 |
| commit | 07f82ac29be42098ab5b135cb173437f9cd7c754 (patch) | |
| tree | 52ede505210af0dd06421e9644fa09705d4703cd /.github/workflows/tests.yml | |
| parent | Recommend upgrading treq alongside twisted (#11943) (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-07f82ac29be42098ab5b135cb173437f9cd7c754.tar.xz | |
Merge branch 'release-v1.53'
Diffstat (limited to '.github/workflows/tests.yml')
| -rw-r--r-- | .github/workflows/tests.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0f80aaaa7..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 @@ -383,7 +383,7 @@ jobs: # Run Complement - run: | set -o pipefail - go test -v -json -tags synapse_blacklist,msc2403 ./tests/... 2>&1 | gotestfmt + go test -v -json -p 1 -tags synapse_blacklist,msc2403 ./tests/... 2>&1 | gotestfmt shell: bash name: Run Complement Tests env: |