Skip to content

Commit e788fe3

Browse files
MiqueasherMiqueasher
committed
Update 3p actions from VID to CSHA
1 parent 63f08b1 commit e788fe3

15 files changed

+141
-128
lines changed

‎.github/actions/cpUtility-testing/action.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,28 @@ runs:
2525
using: "composite"
2626
steps:
2727
- name: Set up QEMU
28-
uses: docker/setup-qemu-action@v3
28+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #3.6.0
2929

3030
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v3
31+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 #v3.11.1
3232
with:
3333
driver-opts: image=moby/buildkit:v0.15.1
3434

3535
- name: Configure AWS Credentials
36-
uses: aws-actions/configure-aws-credentials@v4
36+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
3737
with:
3838
role-to-assume: ${{ inputs.snapshot-ecr-role }}
3939
aws-region: ${{ inputs.aws-region }}
4040

4141
- name: Login to private staging ecr
42-
uses: docker/login-action@v3
42+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
4343
with:
4444
registry: ${{ inputs.image_registry }}
4545
env:
4646
AWS_REGION: ${{ inputs.aws-region }}
4747

4848
- name: Build image for testing
49-
uses: docker/build-push-action@v5
49+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
5050
with:
5151
push: false
5252
build-args: "ADOT_JAVA_VERSION=${{ inputs.adot-java-version }}"
@@ -60,7 +60,7 @@ runs:
6060
run: .github/scripts/test-adot-javaagent-image.sh "${{ inputs.image_uri_with_tag }}" "${{ inputs.adot-java-version }}"
6161

6262
- name: Build and push image
63-
uses: docker/build-push-action@v5
63+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
6464
with:
6565
push: true
6666
build-args: "ADOT_JAVA_VERSION=${{ inputs.adot-java-version }}"

‎.github/actions/patch-dependencies/action.yml‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,38 +60,44 @@ runs:
6060
env.patch_otel_java_contrib == 'true' }}
6161
shell: bash
6262

63-
- name: Build opentelemetry-java with tests
64-
uses: gradle/gradle-build-action@v2
63+
- name: Setup Gradle
64+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
6565
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'false' }}
66-
with:
67-
arguments: build publishToMavenLocal
68-
build-root-directory: opentelemetry-java
66+
67+
- name: Build opentelemetry-java with tests
68+
build-root-directory: opentelemetry-java
69+
run: ./gradlew build publishToMavenLocal
6970

70-
- name: Build opentelemetry-java
71-
uses: gradle/gradle-build-action@v2
71+
- name: Setup Gradle
72+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
7273
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests == 'false' }}
73-
with:
74-
arguments: publishToMavenLocal
75-
build-root-directory: opentelemetry-java
74+
75+
- name: Build opentelemetry-java
76+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
77+
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests == 'false' }}working-directory opentelemetry-java
78+
79+
run: ./gradlew publishToMavenLocal
7680

7781
- name: cleanup opentelemetry-java
7882
run: rm -rf opentelemetry-java
7983
if: ${{ env.patch_otel_java == 'true' }}
8084
shell: bash
8185

8286
- name: Build opentelemetry-java-contrib with tests
83-
uses: gradle/gradle-build-action@v2
87+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
8488
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests != 'false' }}
85-
with:
86-
arguments: build publishToMavenLocal
87-
build-root-directory: opentelemetry-java-contrib
89+
90+
- name: Build opentelemetry-java-contrib without tests
91+
build-root-directory: opentelemetry-java-contrib
92+
run: ./gradlew build publishToMavenLocal
8893

8994
- name: Build opentelemetry-java-contrib
90-
uses: gradle/gradle-build-action@v2
95+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
9196
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests == 'false' }}
92-
with:
93-
arguments: publishToMavenLocal
94-
build-root-directory: opentelemetry-java-contrib
97+
98+
- name: Build opentelemetry-java-contrib
99+
build-root-directory: opentelemetry-java-contrib
100+
run: ./gradlew build publishToMavenLocal
95101

96102
- name: cleanup opentelemetry-java-contrib
97103
run: rm -rf opentelemetry-java-contrib

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
227227

228228
- name: Build snapshot with Gradle
229-
run: contractTests -PlocalDocker=true
229+
run: ./gradlew contractTests -PlocalDocker=true
230230

231231
application-signals-lambda-layer-build:
232232
runs-on: ubuntu-latest

‎.github/workflows/nightly-upstream-snapshot-build.yml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
image_name: ${{ steps.imageOutput.outputs.imageName }}
2424

2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcb5dd907a8 # v5.0.0
2727
with:
2828
fetch-depth: 0
2929

@@ -34,7 +34,7 @@ jobs:
3434

3535
# cache local patch outputs
3636
- name: Cache local Maven repository
37-
uses: actions/cache@v3
37+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3838
with:
3939
path: |
4040
~/.m2/repository/io/opentelemetry/
@@ -49,20 +49,21 @@ jobs:
4949
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5050

5151
- name: Configure AWS Credentials
52-
uses: aws-actions/configure-aws-credentials@v4
52+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
5353
with:
5454
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
5555
aws-region: ${{ env.AWS_DEFAULT_REGION }}
5656

5757
- name: Log in to AWS ECR
58-
uses: docker/login-action@v3
58+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
5959
with:
6060
registry: public.ecr.aws
6161

62+
- name: Setup Gradle
63+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
64+
6265
- name: Build snapshot with Gradle
63-
uses: gradle/gradle-build-action@v3
64-
with:
65-
arguments: build --stacktrace -PenableCoverage=true -PtestUpstreamSnapshots=true
66+
run: ./gradlew build --stacktrace -PenableCoverage=true -PtestUpstreamSnapshots=true
6667
env:
6768
PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
6869
PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
@@ -95,7 +96,7 @@ jobs:
9596
snapshot-ecr-role: ${{ secrets.JAVA_INSTRUMENTATION_SNAPSHOT_ECR }}
9697

9798
- name: Upload to GitHub Actions
98-
uses: actions/upload-artifact@v4
99+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2
99100
with:
100101
name: aws-opentelemetry-agent.jar
101102
path: otelagent/build/libs/aws-opentelemetry-agent-*.jar
@@ -129,7 +130,7 @@ jobs:
129130
runs-on: ubuntu-latest
130131
needs: build
131132
steps:
132-
- uses: actions/checkout@v5
133+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcb5dd907a8 # v5.0.0
133134
with:
134135
fetch-depth: 0
135136
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -139,23 +140,24 @@ jobs:
139140
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
140141

141142
- name: Configure AWS Credentials
142-
uses: aws-actions/configure-aws-credentials@v4
143+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
143144
with:
144145
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
145146
aws-region: ${{ env.AWS_DEFAULT_REGION }}
146147

147148
- name: Log in to AWS ECR
148-
uses: docker/login-action@v3
149+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
149150
with:
150151
registry: public.ecr.aws
151152

152153
- name: Pull base image of Contract Tests Sample Apps
153154
run: docker pull public.ecr.aws/docker/library/amazoncorretto:23-alpine
154155

155-
- name: Build snapshot with Gradle
156-
uses: gradle/gradle-build-action@v3
157-
with:
158-
arguments: contractTests -PtestUpstreamSnapshots=true -PlocalDocker=true
156+
- name: Setup Gradle
157+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
158+
159+
- name: Build snapshot with Gradle
160+
run: ./gradlew contractTests -PtestUpstreamSnapshots=true -PlocalDocker=true
159161

160162
# AppSignals specific e2e tests
161163
appsignals-e2e-test:

‎.github/workflows/patch-release-build.yml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
name: Check out release branch
3838
# Will fail if there is no release branch yet or succeed otherwise
3939
continue-on-error: true
40-
uses: actions/checkout@v5
40+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
4141
with:
4242
ref: ${{ steps.parse-release-branch.outputs.release-branch-name }}
4343
- id: checkout-release-tag
4444
name: Check out release tag
4545
# If there is already a release branch, the previous step succeeds and we don't run this or the next one.
4646
if: ${{ steps.checkout-release-branch.outcome == 'failure' }}
47-
uses: actions/checkout@v5
47+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
4848
with:
4949
ref: ${{ steps.parse-release-branch.outputs.release-tag-name }}
5050
- name: Create release branch
@@ -57,7 +57,7 @@ jobs:
5757
needs: prepare-release-branch
5858
steps:
5959
- name: Checkout release branch
60-
uses: actions/checkout@v5
60+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
6161
with:
6262
ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}
6363

@@ -66,12 +66,12 @@ jobs:
6666
java-version-file: .java-version
6767
distribution: 'temurin'
6868
- name: Configure AWS Credentials
69-
uses: aws-actions/configure-aws-credentials@v4
69+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
7070
with:
7171
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
7272
aws-region: ${{ env.AWS_DEFAULT_REGION }}
7373
- name: Log in to AWS ECR
74-
uses: docker/login-action@v3
74+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
7575
with:
7676
registry: public.ecr.aws
7777

@@ -89,32 +89,33 @@ jobs:
8989
echo $word | sed 's/ *$//g' | sed 's/^ *//g' | git cherry-pick --stdin
9090
done
9191
92+
- name: Setup Gradle
93+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
94+
9295
- name: Build release with Gradle
93-
uses: gradle/gradle-build-action@v3
94-
with:
95-
arguments: build integrationTests -PlocalDocker=true -Prelease.version=${{ github.event.inputs.version }} --stacktrace
96+
run: ./gradlew build integrationTests -PlocalDocker=true -Prelease.version=${{ github.event.inputs.version }} --stacktrace
9697

9798
- name: Configure AWS Credentials
98-
uses: aws-actions/configure-aws-credentials@v4
99+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
99100
with:
100101
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN_RELEASE }}
101102
aws-region: ${{ env.AWS_DEFAULT_REGION }}
102103

103104
- name: Log in to AWS ECR
104-
uses: docker/login-action@v3
105+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
105106
with:
106107
registry: public.ecr.aws
107108

108109
- name: Set up QEMU
109-
uses: docker/setup-qemu-action@v3
110+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #3.6.0
110111

111112
- name: Set up Docker Buildx
112-
uses: docker/setup-buildx-action@v3
113+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 #v3.11.1
113114
with:
114115
driver-opts: image=moby/buildkit:v0.15.1
115116

116117
- name: Build image for testing
117-
uses: docker/build-push-action@v6
118+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
118119
with:
119120
push: false
120121
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
@@ -128,7 +129,7 @@ jobs:
128129
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
129130

130131
- name: Build and push image
131-
uses: docker/build-push-action@v6
132+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
132133
with:
133134
push: true
134135
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
@@ -137,10 +138,11 @@ jobs:
137138
tags: |
138139
public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}
139140
141+
- name: Setup Gradle
142+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
143+
140144
- name: Build and Publish release with Gradle
141-
uses: gradle/gradle-build-action@v3
142-
with:
143-
arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
145+
run: ./gradlew build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
144146
env:
145147
PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
146148
PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout main
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
2828
with:
2929
ref: main
3030
fetch-depth: 0
@@ -63,21 +63,21 @@ jobs:
6363
needs: check-version
6464
steps:
6565
- name: Configure AWS credentials for BOT secrets
66-
uses: aws-actions/configure-aws-credentials@v4
66+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
6767
with:
6868
role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRETS_MANAGER }}
6969
aws-region: ${{ env.AWS_DEFAULT_REGION }}
7070

7171
- name: Get Bot secrets
72-
uses: aws-actions/aws-secretsmanager-get-secrets@v1
72+
uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
7373
id: bot_secrets
7474
with:
7575
secret-ids: |
7676
BOT_TOKEN ,${{ secrets.BOT_TOKEN_SECRET_ARN }}
7777
parse-json-secrets: true
7878

7979
- name: Setup Git
80-
uses: actions/checkout@v2
80+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
8181
with:
8282
fetch-depth: 0
8383
token: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}

0 commit comments

Comments
 (0)