Alpha workflows: fixes

rabbitmq · Nov 11, 2024 · df7fac0 · df7fac0
1 parent 07b694f
commit df7fac0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/release-4.0.x-alphas.yaml b/.github/workflows/release-4.0.x-alphas.yaml
@@ -11,7 +11,7 @@ on:
 env:
   DEV_WORKFLOW_REPOSITORY: "rabbitmq/server-packages"
 jobs:
-  compute_prerelease_data:
+  trigger_alpha_build:
     runs-on: ubuntu-latest
     steps:
       - name: Compute prerelease identifier from commit SHA
@@ -20,9 +20,6 @@ jobs:
         run: echo "PRERELEASE_TIMESTAMP=`date --rfc-3339=seconds`" >> $GITHUB_ENV
       - name: Compute UNIX release timestamp
         run: echo "PRERELEASE_UNIX_TIMESTAMP=`date +%s`" >> $GITHUB_ENV
-  trigger_alpha_build:
-    runs-on: ubuntu-latest
-    steps:
       - name: Trigger a 4.0.x alpha release build in ${{ env.DEV_WORKFLOW_REPOSITORY }}
         run: |
           curl -L \

diff --git a/.github/workflows/release-4.1.x-alphas.yaml b/.github/workflows/release-4.1.x-alphas.yaml
@@ -12,7 +12,7 @@ on:
 env:
   DEV_WORKFLOW_REPOSITORY: "rabbitmq/server-packages"
 jobs:
-  compute_prerelease_data:
+  trigger_alpha_build:
     runs-on: ubuntu-latest
     steps:
       - name: Compute prerelease identifier from commit SHA
@@ -21,16 +21,12 @@ jobs:
         run: echo "PRERELEASE_TIMESTAMP=`date --rfc-3339=seconds`" >> $GITHUB_ENV
       - name: Compute UNIX release timestamp
         run: echo "PRERELEASE_UNIX_TIMESTAMP=`date +%s`" >> $GITHUB_ENV
-  trigger_alpha_build:
-    runs-on: ubuntu-latest
-    needs: [compute_prerelease_data]
-    steps:
-    - name: Trigger a 4.1.x alpha release build in ${{ env.DEV_WORKFLOW_REPOSITORY }}
-      run: |
-        curl -L \
-          -X POST \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.RABBITMQCI_BOT_TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/repos/${{ env.DEV_WORKFLOW_REPOSITORY }}/dispatches \
-          -d '{ "event_type": "new_4.1.x_alpha", "client_payload": {"release_repository": "${{ env.DEV_WORKFLOW_REPOSITORY }}", "release_description": "Commit: https://github.com/rabbitmq/rabbitmq-server/commit/${{ github.sha }}, pushed at: ${{ github.event.repository.pushed_at }}", "prerelease": true, "prerelease_kind": "alpha", "prerelease_identifier": "${{ env.PRERELEASE_IDENTIFIER }}", "release_title": "RabbitMQ ${{ vars.SERVER_41_NEXT_PATCH_VERSION }}-alpha.${{ github.sha }} (from ${{ github.event.repository.pushed_at }})", "base_version": "${{ vars.SERVER_41_NEXT_PATCH_VERSION }}" }}'
+      - name: Trigger a 4.1.x alpha release build in ${{ env.DEV_WORKFLOW_REPOSITORY }}
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.RABBITMQCI_BOT_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ env.DEV_WORKFLOW_REPOSITORY }}/dispatches \
+            -d '{ "event_type": "new_4.1.x_alpha", "client_payload": {"release_repository": "${{ env.DEV_WORKFLOW_REPOSITORY }}", "release_description": "Commit: https://github.com/rabbitmq/rabbitmq-server/commit/${{ github.sha }}, pushed at: ${{ github.event.repository.pushed_at }}", "prerelease": true, "prerelease_kind": "alpha", "prerelease_identifier": "${{ env.PRERELEASE_IDENTIFIER }}", "release_title": "RabbitMQ ${{ vars.SERVER_41_NEXT_PATCH_VERSION }}-alpha.${{ github.sha }} (from ${{ github.event.repository.pushed_at }})", "base_version": "${{ vars.SERVER_41_NEXT_PATCH_VERSION }}" }}'