updatecli: verify commits for golang and beats (#13107)

(cherry picked from commit 8182fb1)
elastic · May 8, 2024 · aecf504 · aecf504
1 parent 6f99b4b
commit aecf504
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml
@@ -23,13 +23,12 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: elastic
       repository: apm-server
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
       branch: main
+      commitusingapi: true
 
 sources:
   minor:

diff --git a/.ci/update-beats.yml b/.ci/update-beats.yml
@@ -6,13 +6,12 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: elastic
       repository: apm-server
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
       branch: '{{ requiredEnv "BRANCH_NAME" }}'
+      commitusingapi: true
 
 actions:
   default:

diff --git a/.github/workflows/bump-elastic-stack.yml b/.github/workflows/bump-elastic-stack.yml
@@ -39,4 +39,3 @@ jobs:
           command: '--experimental apply'
         env:
           BRANCH: ${{ matrix.branch }}
-          GITHUB_ACTOR: ${{ github.actor }}
diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml
@@ -21,3 +21,4 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: ./.ci/bump-golang.yml
+          command: '--experimental apply'
diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml
@@ -39,6 +39,7 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: ./.ci/update-beats.yml
+          command: '--experimental apply'
       - if: failure()
         uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
         with: