From 1a17acb2e123d67da36594ef5da8bcde7a3116a7 Mon Sep 17 00:00:00 2001
From: Adrien Mannocci <adrien.mannocci@elastic.co>
Date: Tue, 2 Apr 2024 15:56:11 +0200
Subject: [PATCH] ci(fix): correct buildkite pipeline trigger (#3578)

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>
---
 .github/workflows/release.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 53c3ed5f58..d7b05b048f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,7 +84,6 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: apm-agent-java-release
-          pipelineCommit: ${{ env.RELEASE_VERSION }}
           waitFor: true
           printBuildLogs: false
           buildEnvVars: |
@@ -204,9 +203,24 @@ jobs:
           cat .ci/.arn-file.md >> $GITHUB_OUTPUT
           echo 'ARN_CONTENT_EOF' >> $GITHUB_OUTPUT
 
+  post-release:
+    name: "Bump versions and create PR"
+    needs:
+      - await-maven-central-artifact
+    uses: ./.github/workflows/pre-post-release.yml
+    permissions:
+      contents: write
+    if: inputs.dry_run == false
+    with:
+      ref: ${{ inputs.ref }}
+      version: ${{ inputs.version }}
+      phase: 'post'
+    secrets: inherit
+
   create-github-release:
     name: "Create GitHub Release"
     needs:
+      - post-release
       - publish-aws-lambda
       - update-major-branch
     runs-on: ubuntu-latest
@@ -238,20 +252,6 @@ jobs:
             --notes="[Release Notes for ${{ env.RELEASE_VERSION }}](https://www.elastic.co/guide/en/apm/agent/java/current/release-notes-${{ steps.get_dotx_branch.outputs.dotx_branch }}.html#release-notes-${{ env.RELEASE_VERSION }})
             ${{ needs.publish-aws-lambda.outputs.arn_content }}"
 
-  post-release:
-    name: "Bump versions and create PR"
-    needs:
-      - await-maven-central-artifact
-    uses: ./.github/workflows/pre-post-release.yml
-    permissions:
-      contents: write
-    if: inputs.dry_run == false
-    with:
-      ref: ${{ inputs.ref }}
-      version: ${{ inputs.version }}
-      phase: 'post'
-    secrets: inherit
-
   notify:
     if: ${{ always() && ! inputs.dry_run }}
     needs: