Use the release branch for sytest in release-branch PRs (#17306)

element-hq · Jun 17, 2024 · 12d7303 · 12d7303
1 parent a3cb244
commit 12d7303
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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') || '' }}

diff --git a/changelog.d/17306.misc b/changelog.d/17306.misc
@@ -0,0 +1 @@
+Use the release branch for sytest in release-branch PRs.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use the release branch for sytest in release-branch PRs.