diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml index 980d6480640..b863c094858 100644 --- a/.ci/bump-golang.yml +++ b/.ci/bump-golang.yml @@ -52,7 +52,7 @@ sources: owner: golang repository: go token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GIT_USER" }}' + username: '{{ requiredEnv "GITHUB_ACTOR" }}' versionfilter: kind: regex pattern: go1\.{{ source "minor" }}\.\d*$ diff --git a/.github/workflows/bump-elastic-stack.yml b/.github/workflows/bump-elastic-stack.yml index 5bd7d404cf4..30286c6cfc7 100644 --- a/.github/workflows/bump-elastic-stack.yml +++ b/.github/workflows/bump-elastic-stack.yml @@ -30,12 +30,16 @@ jobs: with: ref: ${{ matrix.branch }} - - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current + - uses: elastic/oblt-actions/updatecli/run@v1.2.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - pipeline: ./.ci/bump-elastic-stack-snapshot.yml - command: '--experimental apply' + command: --experimental apply --config .ci/bump-elastic-stack-snapshot.yml env: BRANCH: ${{ matrix.branch }} + GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + + - if: ${{ failure() }} + uses: elastic/oblt-actions/slack/send@v1.2.0 + with: + channel-id: '#apm-server' + message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on " + bot-token: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml index 3fbcd7558da..d57d1d6ff12 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -15,10 +15,15 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current + + - uses: elastic/oblt-actions/updatecli/run@v1.2.0 + with: + command: --experimental apply --config .ci/bump-golang.yml + env: + GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + + - uses: elastic/oblt-actions/slack/send@v1.2.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - pipeline: ./.ci/bump-golang.yml - command: '--experimental apply' + bot-token: ${{ secrets.SLACK_BOT_TOKEN }} + channel-id: "#apm-server" + message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on " diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml index be5f1e2e816..92694cfaa23 100644 --- a/.github/workflows/update-beats.yml +++ b/.github/workflows/update-beats.yml @@ -28,22 +28,21 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} + - uses: actions/setup-go@v5 with: go-version-file: go.mod - - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current + + - uses: elastic/oblt-actions/updatecli/run@v1.2.0 + with: + command: --experimental apply --config .ci/update-beats.yml env: BRANCH_NAME: ${{ matrix.branch }} + GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + + - if: ${{ failure() }} + uses: elastic/oblt-actions/slack/send@v1.2.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - 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: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - slackChannel: "#apm-server" + channel-id: '#apm-server' + message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on " + bot-token: ${{ secrets.SLACK_BOT_TOKEN }}