From ad92c21a0b554dce4ccfeb4ac20f47fd421f7a9e Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 14 Jun 2024 14:51:44 +0200 Subject: [PATCH 1/5] Use the release branch for sytest in release-branch PRs --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 20afe311fef..eddf0c793cf 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.head_ref, 'release-') && github.head_ref || 'develop' }} SYTEST_BRANCH: ${{ github.head_ref }} POSTGRES: ${{ matrix.job.postgres && 1}} MULTI_POSTGRES: ${{ (matrix.job.postgres == 'multi-postgres') || '' }} From 5e70814583fda79328e647694377c205b6c4cd28 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 14 Jun 2024 14:53:58 +0200 Subject: [PATCH 2/5] Newsfile --- changelog.d/17307.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/17307.misc diff --git a/changelog.d/17307.misc b/changelog.d/17307.misc new file mode 100644 index 00000000000..88ada5f6711 --- /dev/null +++ b/changelog.d/17307.misc @@ -0,0 +1 @@ +Use the release branch for sytest in release-branch PRs. From 7d7d602773f36bba700037ef33f3b7d364b3fc6c Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 14 Jun 2024 15:05:39 +0200 Subject: [PATCH 3/5] Move the newsfile to the right place --- changelog.d/{17307.misc => 17306.misc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{17307.misc => 17306.misc} (100%) diff --git a/changelog.d/17307.misc b/changelog.d/17306.misc similarity index 100% rename from changelog.d/17307.misc rename to changelog.d/17306.misc From f7369efb33516a0689ce69e7424f09adddfcb4cb Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 14 Jun 2024 15:34:24 +0200 Subject: [PATCH 4/5] Fix the workflow? --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eddf0c793cf..fa864e535ff 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -481,7 +481,7 @@ jobs: 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.head_ref, 'release-') && github.head_ref || 'develop' }} + SYTEST_DEFAULT_BRANCH: ${{ startsWith(github.head_ref, 'release-') && github.head_ref || 'develop' }} SYTEST_BRANCH: ${{ github.head_ref }} POSTGRES: ${{ matrix.job.postgres && 1}} MULTI_POSTGRES: ${{ (matrix.job.postgres == 'multi-postgres') || '' }} From b6cff7a3f5f167e6d53eaf6fe9d1e47583ad69e2 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 14 Jun 2024 16:00:22 +0200 Subject: [PATCH 5/5] We would like the base ref, not the head ref --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fa864e535ff..cdd881fbe19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -481,7 +481,7 @@ jobs: 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.head_ref, 'release-') && github.head_ref || 'develop' }} + 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') || '' }}