diff options
| author | Quentin Gliech <quenting@element.io> | 2024-06-17 15:51:16 +0200 |
|---|---|---|
| committer | Quentin Gliech <quenting@element.io> | 2024-06-17 15:51:16 +0200 |
| commit | e88332b5f49235be21ea6c6947ae578665b2982a (patch) | |
| tree | 73b9828e44bbb70084a5493a6b772e64385c1a37 /.github | |
| parent | Enable cross-signing key upload without UIA (#17284) (diff) | |
| parent | 1.109.0rc3 (diff) | |
| download | synapse-e88332b5f49235be21ea6c6947ae578665b2982a.tar.xz | |
Merge branch 'release-v1.109' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/tests.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 20afe311fe..cdd881fbe1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -479,6 +479,9 @@ jobs: volumes: - ${{ github.workspace }}:/src env: + # If this is a pull request to a release branch, use that branch as default branch for sytest, else use develop + # This works because the release script always create a branch on the sytest repo with the same name as the release branch + SYTEST_DEFAULT_BRANCH: ${{ startsWith(github.base_ref, 'release-') && github.base_ref || 'develop' }} SYTEST_BRANCH: ${{ github.head_ref }} POSTGRES: ${{ matrix.job.postgres && 1}} MULTI_POSTGRES: ${{ (matrix.job.postgres == 'multi-postgres') || '' }} |