Skip to content

Commit a968d20

Browse files
authored
Merge branch 'main' into feature/private_bundling
2 parents 3f27fab + 5202eb1 commit a968d20

22 files changed

Lines changed: 2292 additions & 105 deletions

.github/aw/actions-lock.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"entries": {
3+
"actions/download-artifact@v8.0.1": {
4+
"repo": "actions/download-artifact",
5+
"version": "v8.0.1",
6+
"sha": "3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c"
7+
},
38
"actions/github-script@v8": {
49
"repo": "actions/github-script",
510
"version": "v8",
@@ -10,10 +15,20 @@
1015
"version": "v9",
1116
"sha": "373c709c69115d41ff229c7e5df9f8788daa9553"
1217
},
13-
"github/gh-aw-actions/setup@v0.68.3": {
18+
"actions/upload-artifact@v7.0.1": {
19+
"repo": "actions/upload-artifact",
20+
"version": "v7.0.1",
21+
"sha": "043fb46d1a93c77aae656e7c1c64a875d1fc6a0a"
22+
},
23+
"github/gh-aw-actions/setup@v0.69.0": {
1424
"repo": "github/gh-aw-actions/setup",
15-
"version": "v0.68.3",
16-
"sha": "ba90f2186d7ad780ec640f364005fa24e797b360"
25+
"version": "v0.69.0",
26+
"sha": "81b86c58b134601fc10d4745e276d7861cd12911"
27+
},
28+
"microsoft/apm-action@v1.4.1": {
29+
"repo": "microsoft/apm-action",
30+
"version": "v1.4.1",
31+
"sha": "a190b0b1a91031057144dc136acf9757a59c9e4d"
1732
}
1833
}
1934
}

.github/aw/imports/.gitattributes

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/aw/imports/github/gh-aw/e685a0e73cce06fab31ac477082e820ee4dff2e6/.github_workflows_shared_apm.md

Lines changed: 105 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/check-aw-updates.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ jobs:
99
check-updates:
1010
name: Recompile lock files and open PR if changed
1111
runs-on: ubuntu-latest
12+
env:
13+
GH_AW_VERSION: v0.69.0
1214
permissions:
1315
id-token: write
1416
contents: read
1517
steps:
1618
- name: Create ephemeral GitHub token
1719
id: create-token
18-
uses: elastic/oblt-actions/github/create-token@v1
20+
uses: elastic/oblt-actions/github/create-token@v1.38.1
1921
with:
2022
token-policy: token-policy-8749eaab83f2
2123

@@ -29,7 +31,7 @@ jobs:
2931
3032
- name: Install gh-aw and compile
3133
run: |
32-
gh extension install github/gh-aw
34+
gh extension install github/gh-aw --pin "$GH_AW_VERSION"
3335
gh aw compile
3436
env:
3537
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -46,7 +48,7 @@ jobs:
4648
4749
- name: Create pull request
4850
if: steps.changes.outputs.changed == 'true'
49-
uses: peter-evans/create-pull-request@v7
51+
uses: peter-evans/create-pull-request@v8.1.0
5052
with:
5153
token: ${{ steps.create-token.outputs.token }}
5254
commit-message: |
@@ -56,7 +58,7 @@ jobs:
5658
branch: automated/gh-aw-update
5759
title: Update gh-aw lock files
5860
body: |
59-
Automated weekly check detected updated gh-aw lock files after recompilation.
61+
Automated weekly check detected updated gh-aw lock files after recompilation with `${{ env.GH_AW_VERSION }}`.
6062
6163
Review the lock file diffs to verify the changes are expected.
6264
labels: automation

.github/workflows/docs-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
if: steps.context.outputs.is-fork == 'true' && steps.context.outputs.event == 'pull_request'
227227
continue-on-error: true
228228
id: fetch-ephemeral-token
229-
uses: elastic/ci-gh-actions/fetch-github-token@v1
229+
uses: elastic/ci-gh-actions/fetch-github-token@v1.3.0
230230
with:
231231
vault-instance: "ci-prod"
232232
vault-role: "token-policy-8c6a5ed19135"
@@ -785,7 +785,7 @@ jobs:
785785
f.write(f"result=arn:aws:iam::197730964718:role/{prefix}{hash}")
786786
787787
- name: Configure AWS Credentials
788-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
788+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6.1.0
789789
with:
790790
role-to-assume: ${{ steps.role_arn.outputs.result }}
791791
aws-region: us-east-1

0 commit comments

Comments
 (0)