Skip to content

Commit cd1adc5

Browse files
authored
Merge branch 'main' into dependabot/github_actions/burrunan/gradle-cache-action-2
2 parents 1551013 + bb2a092 commit cd1adc5

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
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@v4
34+
- uses: actions/download-artifact@v5
3535
with:
3636
name: aws-opentelemetry-agent.jar
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Docker Buildx
3737
uses: docker/setup-buildx-action@v3
3838
- name: Build docker image
39-
uses: docker/build-push-action@v5
39+
uses: docker/build-push-action@v6
4040
with:
4141
push: true
4242
context: scripts/docker/corretto-slim

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
driver-opts: image=moby/buildkit:v0.15.1
115115

116116
- name: Build image for testing
117-
uses: docker/build-push-action@v5
117+
uses: docker/build-push-action@v6
118118
with:
119119
push: false
120120
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
@@ -128,7 +128,7 @@ jobs:
128128
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
129129

130130
- name: Build and push image
131-
uses: docker/build-push-action@v5
131+
uses: docker/build-push-action@v6
132132
with:
133133
push: true
134134
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"

.github/workflows/pr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
if: ${{ matrix.os == 'ubuntu-latest' }}
132132

133133
- name: Build image for testing
134-
uses: docker/build-push-action@v5
134+
uses: docker/build-push-action@v6
135135
if: ${{ matrix.os == 'ubuntu-latest' }}
136136
with:
137137
push: false

.github/workflows/release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
driver-opts: image=moby/buildkit:v0.15.1
8585

8686
- name: Build image for testing
87-
uses: docker/build-push-action@v5
87+
uses: docker/build-push-action@v6
8888
with:
8989
push: false
9090
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
@@ -98,7 +98,7 @@ jobs:
9898
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
9999

100100
- name: Build and push image
101-
uses: docker/build-push-action@v5
101+
uses: docker/build-push-action@v6
102102
with:
103103
push: true
104104
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"

.github/workflows/release-lambda.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
echo BUCKET_NAME=java-lambda-layer-${{ github.run_id }}-${{ matrix.aws_region }} | tee --append $GITHUB_ENV
9999
100100
- name: download layer.zip
101-
uses: actions/download-artifact@v4
101+
uses: actions/download-artifact@v5
102102
with:
103103
name: aws-opentelemetry-java-layer.zip
104104

@@ -157,7 +157,7 @@ jobs:
157157
uses: actions/checkout@v4
158158
- uses: hashicorp/setup-terraform@v2
159159
- name: download layerARNs
160-
uses: actions/download-artifact@v4
160+
uses: actions/download-artifact@v5
161161
with:
162162
pattern: ${{ env.LAYER_NAME }}-*
163163
path: ${{ env.LAYER_NAME }}
@@ -206,7 +206,7 @@ jobs:
206206
echo "}" >> ../layer_cdk
207207
cat ../layer_cdk
208208
- name: download layer.zip
209-
uses: actions/download-artifact@v4
209+
uses: actions/download-artifact@v5
210210
with:
211211
name: layer.zip
212212
- name: Get commit hash

0 commit comments

Comments
 (0)