Skip to content

Commit 7348f91

Browse files
MiqueasherMiqueasher
committed
updating 3p actions in 8/14 non-release workflow documents
2 parents 55fd102 + c3e5d6e commit 7348f91

File tree

8 files changed

+131
-41
lines changed

8 files changed

+131
-41
lines changed

‎.github/workflows/daily-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
distribution: 'temurin'
3838

3939
- name: Configure AWS credentials for dependency scan
40-
uses: aws-actions/configure-aws-credentials@v4
40+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
4141
with:
4242
role-to-assume: ${{ secrets.SECRET_MANAGER_ROLE_ARN }}
4343
aws-region: ${{ env.AWS_DEFAULT_REGION }}

‎.github/workflows/e2e-tests-app-with-java-agent.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout Java Instrumentation repository
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
28+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
2929
with:
3030
fetch-depth: 0
3131

32-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
32+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
3333
with:
3434
java-version-file: .java-version
3535
distribution: temurin
@@ -51,7 +51,7 @@ jobs:
5151
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
5252

5353
- name: Validate the checksums of Gradle Wrapper
54-
uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
54+
uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
5555

5656
- name: Configure AWS Credentials
5757
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
@@ -71,22 +71,22 @@ jobs:
7171
env:
7272
COMMIT_HASH: ${{ inputs.image_tag }}
7373

74-
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #5.5.1
74+
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #v5.5.1
7575

7676
test_Spring_App_With_Java_Agent:
7777
name: Test Spring App with AWS OTel Java agent
7878
needs: [ build_Images_For_Testing_Sample_App_With_Java_Agent ]
7979
runs-on: ubuntu-latest
8080

8181
steps:
82-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
82+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
8383

8484
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
8585
with:
8686
java-version-file: .java-version
8787
distribution: 'temurin'
8888
- name: Configure AWS Credentials
89-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
89+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
9090
with:
9191
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
9292
aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -110,14 +110,14 @@ jobs:
110110
runs-on: ubuntu-latest
111111

112112
steps:
113-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
113+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
114114

115115
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
116116
with:
117117
java-version-file: .java-version
118118
distribution: 'temurin'
119119
- name: Configure AWS Credentials
120-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
120+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
121121
with:
122122
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
123123
aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -141,14 +141,14 @@ jobs:
141141
runs-on: ubuntu-latest
142142

143143
steps:
144-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
144+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
145145

146-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
146+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
147147
with:
148148
java-version-file: .java-version
149149
distribution: 'temurin'
150150
- name: Configure AWS Credentials
151-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
151+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
152152
with:
153153
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
154154
aws-region: ${{ env.AWS_DEFAULT_REGION }}

‎.github/workflows/e2e-tests-with-operator.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
build-sample-app:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
37+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
3838
with:
3939
fetch-depth: 0
4040

@@ -60,7 +60,7 @@ jobs:
6060
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
6161

6262
- name: Configure AWS Credentials
63-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
63+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
6464
with:
6565
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
6666
aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -71,7 +71,7 @@ jobs:
7171
registry: public.ecr.aws
7272

7373
- name: Build and push Sample-Apps without Auto-Instrumentation Agent
74-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
74+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
7575
with:
7676
arguments: jibBuildWithoutAgent
7777
env:
@@ -84,20 +84,20 @@ jobs:
8484
test-case-batch-value: ${{ steps.set-batches.outputs.batch-values }}
8585
steps:
8686
- name: Checkout Testing Framework repository
87-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
87+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
8888
with:
8989
repository: ${{ env.TESTING_FRAMEWORK_REPO }}
9090
path: testing-framework
9191
ref: ${{ inputs.test_ref }}
9292

9393
- name: Checkout Java Instrumentation repository
94-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
94+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
9595
with:
9696
fetch-depth: 0
9797
path: aws-otel-java-instrumentation
9898

9999
- name: Set up Go 1.x
100-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 #6.0.0
100+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 #v6.0.0
101101
with:
102102
go-version: '~1.18.9'
103103

@@ -126,32 +126,32 @@ jobs:
126126
steps:
127127
# required for versioning
128128
- name: Checkout Java Instrumentation repository
129-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
129+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
130130
with:
131131
fetch-depth: 0
132132
path: aws-otel-java-instrumentation
133133

134134
- name: Set up JDK 11
135-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
135+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
136136
with:
137137
distribution: 'zulu'
138138
java-version: '11'
139139

140140
- name: Set up terraform
141-
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd #3.1.2
141+
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd #v3.1.2
142142
with:
143143
terraform_version: "~1.5"
144144

145145
- name: Configure AWS Credentials
146-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
146+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
147147
with:
148148
role-to-assume: ${{ secrets.JAVA_INSTRUMENTATION_INTEG_TEST_ARN}}
149149
aws-region: us-west-2
150150
# 4 hours
151151
role-duration-seconds: 14400
152152

153153
- name: Checkout Testing Framework repository
154-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
154+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
155155
with:
156156
repository: ${{ env.TESTING_FRAMEWORK_REPO }}
157157
path: testing-framework

‎.github/workflows/main-build.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
name: Test patches applied to dependencies
2323
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
2424
steps:
25-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
26-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
25+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
26+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
2727
with:
2828
java-version-file: .java-version
2929
distribution: temurin
3030
# vaadin 14 tests fail with node 18
3131
- name: Set up Node
32-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 #5.0.0
32+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 #v5.0.0
3333
with:
3434
node-version: 16
3535

@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
path: ~/.pnpm-store
4141
key: ${{ runner.os }}-test-cache-pnpm-modules
42-
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
42+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
4343
- uses: ./.github/actions/patch-dependencies
4444
with:
4545
run_tests: "true"
@@ -54,10 +54,10 @@ jobs:
5454
staging_registry: ${{ steps.imageOutput.outputs.stagingRegistry }}
5555
staging_repository: ${{ steps.imageOutput.outputs.stagingRepository }}
5656
steps:
57-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
57+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
5858
with:
5959
fetch-depth: 0
60-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
60+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
6161
with:
6262
java-version-file: .java-version
6363
distribution: temurin
@@ -76,10 +76,10 @@ jobs:
7676
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
7777
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
7878

79-
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
79+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
8080

8181
- name: Configure AWS Credentials
82-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
82+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
8383
with:
8484
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
8585
aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -189,17 +189,17 @@ jobs:
189189
runs-on: ubuntu-latest
190190
needs: build
191191
steps:
192-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
192+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
193193
with:
194194
fetch-depth: 0
195-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
195+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
196196
with:
197197
java-version: 23
198198
distribution: 'temurin'
199-
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
199+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
200200

201201
- name: Configure AWS Credentials
202-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
202+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
203203
with:
204204
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
205205
aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -222,17 +222,17 @@ jobs:
222222
run: docker pull public.ecr.aws/docker/library/amazoncorretto:23-alpine
223223

224224
- name: Build snapshot with Gradle
225-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
225+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
226226
with:
227227
arguments: contractTests -PlocalDocker=true
228228

229229
application-signals-lambda-layer-build:
230230
runs-on: ubuntu-latest
231231
steps:
232-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
232+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
233233
with:
234234
fetch-depth: 0
235-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
235+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
236236
with:
237237
java-version-file: .java-version
238238
distribution: 'temurin'
@@ -246,7 +246,7 @@ jobs:
246246
name: aws-opentelemetry-java-layer.zip
247247
path: lambda-layer/build/distributions/aws-opentelemetry-java-layer.zip
248248
- name: Configure AWS Credentials
249-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
249+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
250250
with:
251251
role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
252252
aws-region: us-east-1
@@ -270,7 +270,7 @@ jobs:
270270
if: always()
271271
steps:
272272
- name: Configure AWS Credentials for emitting metrics
273-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
273+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
274274
with:
275275
role-to-assume: ${{ secrets.METRICS_ROLE_ARN }}
276276
aws-region: us-east-1

‎.github/workflows/post-release-version-bump.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
version:
77
description: 'Version number (e.g., 1.0.1)'
88
required: true
9+
is_patch:
10+
description: 'Is this a patch? (true or false)'
11+
required: true
12+
default: 'false'
913

1014
env:
1115
AWS_DEFAULT_REGION: us-east-1
@@ -100,8 +104,20 @@ jobs:
100104
sed -i'' -e "s/val adotVersion = \".*\"/val adotVersion = \"${DEV_VERSION}\"/" version.gradle.kts
101105
VERSION="${{ github.event.inputs.version }}"
102106
sed -i'' -e 's/adot-autoinstrumentation-java:v2.*"/adot-autoinstrumentation-java:v'$VERSION'"/' .github/workflows/daily-scan.yml
107+
108+
# for patch releases, avoid merge conflict by manually resolving CHANGELOG with main
109+
if [[ "${{ github.event.inputs.is_patch }}" == "true" ]]; then
110+
# Copy the patch release entries
111+
sed -n "/^## v${VERSION}/,/^## v[0-9]/p" CHANGELOG.md | sed '$d' > /tmp/patch_release_section.txt
112+
git fetch origin main
113+
git show origin/main:CHANGELOG.md > CHANGELOG.md
114+
# Insert the patch release entries after Unreleased
115+
awk -i inplace '/^## v[0-9]/ && !inserted { system("cat /tmp/patch_release_section.txt"); inserted=1 } {print}' CHANGELOG.md
116+
fi
117+
103118
git add version.gradle.kts
104119
git add .github/workflows/daily-scan.yml
120+
git add CHANGELOG.md
105121
git commit -m "Prepare main for next development cycle: Update version to $DEV_VERSION"
106122
git push --set-upstream origin "prepare-main-for-next-dev-cycle-${VERSION}"
107123
@@ -117,4 +133,14 @@ jobs:
117133
118134
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice." \
119135
--head prepare-main-for-next-dev-cycle-${VERSION} \
120-
--base main
136+
--base main
137+
138+
- name: Force our CHANGELOG to override merge conflicts
139+
run: |
140+
git merge origin/main || true
141+
git checkout --ours CHANGELOG.md
142+
git add CHANGELOG.md
143+
if ! git diff --quiet --cached; then
144+
git commit -m "Force our CHANGELOG to override merge conflicts"
145+
git push origin "prepare-main-for-next-dev-cycle-${VERSION}"
146+
fi

0 commit comments

Comments
 (0)