From 1aa7ceed705f23d451eaebc2e00fc5f3581be7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Wed, 20 Nov 2024 14:09:06 +0100 Subject: [PATCH 1/3] GitHub Actions: Run mixed-version testing against 4.0.3 explicitly ... not any release. [Why] Once we release RabbitMQ 4.1.0, it means that the `v4.1.x` branch would be tested against 4.1.x, i.e. itself. Note that we will have to update this pinned version from time to time if needed. --- .github/workflows/test-make-target.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-make-target.yaml b/.github/workflows/test-make-target.yaml index 656364d2a281..5c42626d208b 100644 --- a/.github/workflows/test-make-target.yaml +++ b/.github/workflows/test-make-target.yaml @@ -57,8 +57,9 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master if: inputs.mixed_clusters with: + version: 'tags/v4.0.3' regex: true - file: "rabbitmq-server-generic-unix-[\\d.]*\\.tar.xz" + file: "rabbitmq-server-generic-unix-[\\d.]*\\.tar\\.xz" target: ./ - name: MIXED CLUSTERS - SETUP SECONDARY_DIST From c648b327ac3a09339c81402b53f1a5b8905458cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Wed, 20 Nov 2024 18:15:22 +0100 Subject: [PATCH 2/3] GitHub Actions: Derive secondary dist version from archive filename [Why] Using the `fetch-gh-release-asset` action outputs work fine for our official releases, but it does not for our alphas published to `rabbitmq/server-packages` because the filenames use another version compared to the GitHub release. [How] Always derive the version from the archive filename. This is safe regardless of what the GitHub release states. --- .github/workflows/test-make-target.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-make-target.yaml b/.github/workflows/test-make-target.yaml index 5c42626d208b..2dbc24164f00 100644 --- a/.github/workflows/test-make-target.yaml +++ b/.github/workflows/test-make-target.yaml @@ -65,11 +65,16 @@ jobs: - name: MIXED CLUSTERS - SETUP SECONDARY_DIST if: inputs.mixed_clusters run: | + ls -l rabbitmq-server-generic-unix-*.tar.xz* + + archive_name=$(echo rabbitmq-server-generic-unix-*.tar.xz) + archive_version=$(echo $archive_name | sed -E -e 's/^rabbitmq-server-generic-unix-//' -e 's/\.tar\.xz$//') + gpg --import rabbitmq-release-signing-key.asc - gpg --verify rabbitmq-server-generic-unix-*.asc rabbitmq-server-generic-unix-*.tar.xz - tar xf rabbitmq-server-generic-unix-*.tar.xz + gpg --verify $archive_name.asc $archive_name + tar xf $archive_name - echo "SECONDARY_DIST=${GITHUB_WORKSPACE}/rabbitmq_server-`echo -n ${{ steps.fetch_secondary_dist.outputs.version }} | sed s/v//`" >> $GITHUB_ENV + echo "SECONDARY_DIST=${GITHUB_WORKSPACE}/rabbitmq_server-$archive_version" >> $GITHUB_ENV - name: SETUP DOTNET (rabbit) uses: actions/setup-dotnet@v4 From 37539d0459386ab03ae2ab83faad24c4dd06b2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Wed, 20 Nov 2024 18:36:34 +0100 Subject: [PATCH 3/3] GitHub Actions: Relax the regex to match the generix-unix archive [Why] Our alpha packages published to `rabbitmq/server-packages` use letters in addition to digits and dots. [How] Accept any string that starts with a digit as the version here. We just enforce the prefix and the filename extension. The digit at the beginning it here to exclude the `rabbitmq-server-generic-unix-latest-toolchain-*.tar.xz` archive. --- .github/workflows/test-make-target.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-make-target.yaml b/.github/workflows/test-make-target.yaml index 2dbc24164f00..dbe33be8ceff 100644 --- a/.github/workflows/test-make-target.yaml +++ b/.github/workflows/test-make-target.yaml @@ -59,7 +59,7 @@ jobs: with: version: 'tags/v4.0.3' regex: true - file: "rabbitmq-server-generic-unix-[\\d.]*\\.tar\\.xz" + file: "rabbitmq-server-generic-unix-\\d.+\\.tar\\.xz" target: ./ - name: MIXED CLUSTERS - SETUP SECONDARY_DIST