Skip to content

Commit 22fdff3

Browse files
Miqueasherjj22ee
Miqueasher
authored and
jj22ee
committed
Revert "update for 8/14 non-release workflow documents (#1193)" (#1195)
This reverts commit 069ea22. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 0c25131 commit 22fdff3

8 files changed

+81
-81
lines changed

‎.github/workflows/application-signals-e2e-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Configure AWS Credentials
29-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
29+
uses: aws-actions/configure-aws-credentials@v4
3030
with:
3131
role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
3232
aws-region: us-east-1
3333

34-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #5.0.0
34+
- uses: actions/download-artifact@v5
3535
with:
3636
name: aws-opentelemetry-agent.jar
3737

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
26+
uses: actions/checkout@v5
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@16df4fbc19aea13d921737861d6c622bf3cefe23 #v3.30.3
30+
uses: github/codeql-action/init@v3
3131
with:
3232
languages: java
3333

@@ -37,7 +37,7 @@ jobs:
3737
distribution: temurin
3838

3939
- name: Cache local Maven repository
40-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
40+
uses: actions/cache@v3
4141
with:
4242
path: |
4343
~/.m2/repository/io/opentelemetry/
@@ -53,9 +53,9 @@ jobs:
5353
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5454

5555
- name: Manually build to avoid autobuild failures
56-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
56+
uses: gradle/gradle-build-action@v3
5757
with:
5858
arguments: build
5959

6060
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@16df4fbc19aea13d921737861d6c622bf3cefe23 #v3.30.3
61+
uses: github/codeql-action/analyze@v3

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout repo for dependency scan
27-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
27+
uses: actions/checkout@v5
2828
with:
2929
fetch-depth: 0
3030

@@ -35,13 +35,13 @@ jobs:
3535
distribution: 'temurin'
3636

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

4343
- name: Get NVD API key for dependency scan
44-
uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
44+
uses: aws-actions/aws-secretsmanager-get-secrets@v2
4545
id: nvd_api_key
4646
with:
4747
secret-ids: ${{ secrets.NVD_API_KEY_SECRET_ARN }}
@@ -51,7 +51,7 @@ jobs:
5151
uses: ./.github/actions/patch-dependencies
5252

5353
- name: Build JAR
54-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
54+
uses: gradle/gradle-build-action@v3
5555
with:
5656
arguments: assemble -PlocalDocker=true
5757

@@ -77,13 +77,13 @@ jobs:
7777
run: less dependency-check-report.html
7878

7979
- name: Configure AWS credentials for image scan
80-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
80+
uses: aws-actions/configure-aws-credentials@v4
8181
with:
8282
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
8383
aws-region: ${{ env.AWS_DEFAULT_REGION }}
8484

8585
- name: Login to Public ECR
86-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
86+
uses: docker/login-action@v3
8787
with:
8888
registry: public.ecr.aws
8989

@@ -121,7 +121,7 @@ jobs:
121121

122122
- name: Configure AWS Credentials for emitting metrics
123123
if: always()
124-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
124+
uses: aws-actions/configure-aws-credentials@v4
125125
with:
126126
role-to-assume: ${{ secrets.METRICS_ROLE_ARN }}
127127
aws-region: ${{ env.AWS_DEFAULT_REGION }}

‎.github/workflows/docker-build-corretto-slim.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ jobs:
1919
build-corretto:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
22+
- uses: actions/checkout@v5
2323
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
2424
- name: Configure AWS Credentials
25-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
25+
uses: aws-actions/configure-aws-credentials@v4
2626
with:
2727
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
2828
aws-region: ${{ env.AWS_DEFAULT_REGION }}
2929
- name: Log in to AWS ECR
30-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
30+
uses: docker/login-action@v3
3131
with:
3232
registry: public.ecr.aws
3333

3434
- name: Set up QEMU
35-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #3.6.0
35+
uses: docker/setup-qemu-action@v3
3636
- name: Set up Docker Buildx
37-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 #v3.11.1
37+
uses: docker/setup-buildx-action@v3
3838
- name: Build docker image
39-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #6.18.0
39+
uses: docker/build-push-action@v6
4040
with:
4141
push: true
4242
context: scripts/docker/corretto-slim

‎.github/workflows/docker-build-smoke-tests-fake-backend.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
build-docker:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
23+
- uses: actions/checkout@v5
2424
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2525
with:
2626
java-version: 17
2727
distribution: 'temurin'
2828
# cache local patch outputs
2929
- name: Cache local Maven repository
30-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
30+
uses: actions/cache@v3
3131
with:
3232
path: |
3333
~/.m2/repository/io/opentelemetry/
@@ -40,16 +40,16 @@ jobs:
4040
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
4141
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
4242
- name: Configure AWS Credentials
43-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
43+
uses: aws-actions/configure-aws-credentials@v4
4444
with:
4545
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
4646
aws-region: ${{ env.AWS_DEFAULT_REGION }}
4747
- name: Log in to AWS ECR
48-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
48+
uses: docker/login-action@v3
4949
with:
5050
registry: public.ecr.aws
5151

5252
- name: Build and push docker image
53-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
53+
uses: gradle/gradle-build-action@v3
5454
with:
5555
arguments: :smoke-tests:fakebackend:jib

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout Java Instrumentation repository
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
28+
uses: actions/checkout@v5
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: 17
3535
distribution: temurin
3636

3737
# cache local patch outputs
3838
- name: Cache local Maven repository
3939
id: cache-local-maven-repo
40-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
40+
uses: actions/cache@v3
4141
with:
4242
path: |
4343
~/.m2/repository/io/opentelemetry/
@@ -51,47 +51,47 @@ 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
57-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
57+
uses: aws-actions/configure-aws-credentials@v4
5858
with:
5959
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
6060
aws-region: ${{ env.AWS_DEFAULT_REGION }}
6161

6262
- name: Log in to AWS ECR
63-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
63+
uses: docker/login-action@v3
6464
with:
6565
registry: public.ecr.aws
6666

6767
- name: Build and push agent and testing docker images with Gradle
68-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
68+
uses: gradle/gradle-build-action@v3
6969
with:
7070
arguments: jib
7171
env:
7272
COMMIT_HASH: ${{ inputs.image_tag }}
7373

74-
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #v5.5.1
74+
- uses: codecov/codecov-action@v5
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 #v5.0.0
82+
- uses: actions/checkout@v5
8383

8484
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
8585
with:
8686
java-version: 17
8787
distribution: 'temurin'
8888
- name: Configure AWS Credentials
89-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
89+
uses: aws-actions/configure-aws-credentials@v4
9090
with:
9191
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
9292
aws-region: ${{ env.AWS_DEFAULT_REGION }}
9393
- name: Log in to AWS ECR
94-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
94+
uses: docker/login-action@v3
9595
with:
9696
registry: public.ecr.aws
9797

@@ -110,19 +110,19 @@ jobs:
110110
runs-on: ubuntu-latest
111111

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

115115
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
116116
with:
117117
java-version: 17
118118
distribution: 'temurin'
119119
- name: Configure AWS Credentials
120-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
120+
uses: aws-actions/configure-aws-credentials@v4
121121
with:
122122
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
123123
aws-region: ${{ env.AWS_DEFAULT_REGION }}
124124
- name: Log in to AWS ECR
125-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
125+
uses: docker/login-action@v3
126126
with:
127127
registry: public.ecr.aws
128128

@@ -141,19 +141,19 @@ jobs:
141141
runs-on: ubuntu-latest
142142

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

146-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
146+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
147147
with:
148148
java-version: 17
149149
distribution: 'temurin'
150150
- name: Configure AWS Credentials
151-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
151+
uses: aws-actions/configure-aws-credentials@v4
152152
with:
153153
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
154154
aws-region: ${{ env.AWS_DEFAULT_REGION }}
155155
- name: Log in to AWS ECR
156-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
156+
uses: docker/login-action@v3
157157
with:
158158
registry: public.ecr.aws
159159

0 commit comments

Comments
 (0)