Skip to content

Commit 9d4b060

Browse files
ccressentccressent
authored
Fix Java/Python workflow, improve NodeJS workflow (#44)
- Update workflows to run on opentelemetry-lambda submodule changes - Update actions/upload-artifact to v4 - Update actions/download-artifact to v4 - Update opentelemetry-lambda submodule to latest release - Update node to v20 (required to even attempt to build the newer opentelemetry-lambda) - Update receiver mock version in tests
1 parent c3fd8b7 commit 9d4b060

File tree

13 files changed

+31
-28
lines changed

13 files changed

+31
-28
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- uses: actions/setup-node@v4
5757
if: env.LANGUAGE == 'nodejs'
5858
with:
59-
node-version: '14'
59+
node-version: '20'
6060
- name: Cache (NodeJS)
6161
if: env.LANGUAGE == 'nodejs'
6262
uses: actions/cache@v3
@@ -85,7 +85,7 @@ jobs:
8585
run: ${{ env.BUILD_COMMAND }}
8686
- name: Upload artifacts - java
8787
if: env.LANGUAGE == 'java' && success()
88-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
9191
path: ${{ env.LANGUAGE }}/${{ env.ARTIFACT_ARCHIVE_BASE_NAME }}-${{ matrix.architecture }}.zip
@@ -97,14 +97,14 @@ jobs:
9797
opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/libs/java-sample-app.jar
9898
- name: Upload artifacts - java sample-app
9999
if: env.LANGUAGE == 'java' && success()
100-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
101101
with:
102102
name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
103103
path: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/libs/java-sample-app.jar
104104
if-no-files-found: error
105105
- name: Upload artifacts - nodejs
106106
if: env.LANGUAGE == 'nodejs' && success()
107-
uses: actions/upload-artifact@v3
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
110110
path: ${{ env.LANGUAGE }}/${{ env.ARTIFACT_ARCHIVE_BASE_NAME }}-${{ matrix.architecture }}.zip
@@ -116,14 +116,14 @@ jobs:
116116
opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/nodejs-sample-app.zip
117117
- name: Upload artifacts - nodejs sample-app
118118
if: env.LANGUAGE == 'nodejs' && success()
119-
uses: actions/upload-artifact@v3
119+
uses: actions/upload-artifact@v4
120120
with:
121121
name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
122122
path: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/nodejs-sample-app.zip
123123
if-no-files-found: error
124124
- name: Upload artifacts - python layer
125125
if: env.LANGUAGE == 'python' && success()
126-
uses: actions/upload-artifact@v3
126+
uses: actions/upload-artifact@v4
127127
with:
128128
name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
129129
path: ${{ env.LANGUAGE }}/${{ env.ARTIFACT_ARCHIVE_BASE_NAME }}-${{ matrix.architecture }}.zip
@@ -135,7 +135,7 @@ jobs:
135135
opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/build/python-sample-app.zip
136136
- name: Upload artifacts - python sample-app
137137
if: env.LANGUAGE == 'python' && success()
138-
uses: actions/upload-artifact@v3
138+
uses: actions/upload-artifact@v4
139139
with:
140140
name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
141141
path: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/build/python-sample-app.zip

‎.github/workflows/pr-build-java.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'java/**'
7+
- 'opentelemetry-lambda/**'
78
- '.github/workflows/*-java.yml'
89
- '.github/workflows/tests.yml'
910
- '!java/sample-apps/template.yaml'

‎.github/workflows/pr-build-nodejs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'nodejs/**'
7+
- 'opentelemetry-lambda/**'
78
- '.github/workflows/*-nodejs.yml'
89
- '.github/workflows/tests.yml'
910
- '!nodejs/sample-apps/template.yaml'

‎.github/workflows/pr-build-python.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'python/**'
7+
- 'opentelemetry-lambda/**'
78
- '.github/workflows/*-python.yml'
89
- '.github/workflows/tests.yml'
910
- '!python/sample-apps/template.yaml'

‎.github/workflows/publish-dev-layer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
python-version: '3.9'
5454
- name: Download artifacts
55-
uses: actions/download-artifact@v3
55+
uses: actions/download-artifact@v4
5656
with:
5757
name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
5858
path: ~/artifact

‎.github/workflows/publish-release-layer.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
with:
6565
python-version: '3.9'
6666
- name: Download artifacts
67-
uses: actions/download-artifact@v3
67+
uses: actions/download-artifact@v4
6868
with:
6969
name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
7070
path: ~/artifact
@@ -102,7 +102,7 @@ jobs:
102102
echo "| ${{ matrix.aws_region }} | $LAYER_ARN |" > layer-arn-${{ matrix.architecture }}-${{ matrix.aws_region }}
103103
- name: Upload Layer ARN
104104
if: success()
105-
uses: actions/upload-artifact@v3
105+
uses: actions/upload-artifact@v4
106106
with:
107107
name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-layer-arns-artifact
108108
path: layer-arn-${{ matrix.architecture }}-${{ matrix.aws_region }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ jobs:
3131
id: extract_tag
3232
run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/java-v})"
3333
- name: Download amd64 layer artifacts
34-
uses: actions/download-artifact@v3
34+
uses: actions/download-artifact@v4
3535
with:
3636
name: ${{ github.ref_name }}-java-amd64-artifacts
3737
path: artifacts/
3838
- name: Download arm64 layer artifacts
39-
uses: actions/download-artifact@v3
39+
uses: actions/download-artifact@v4
4040
with:
4141
name: ${{ github.ref_name }}-java-arm64-artifacts
4242
path: artifacts/
4343
- name: Download sample-app artifacts
44-
uses: actions/download-artifact@v3
44+
uses: actions/download-artifact@v4
4545
with:
4646
name: sample-app-java-amd64-artifacts
4747
path: artifacts/
4848
- name: Download amd64 Layer ARNs
49-
uses: actions/download-artifact@v3
49+
uses: actions/download-artifact@v4
5050
with:
5151
name: ${{ github.ref_name }}-java-amd64-layer-arns-artifact
5252
path: amd64layerarns/
5353
- name: Download arm64 Layer ARNs
54-
uses: actions/download-artifact@v3
54+
uses: actions/download-artifact@v4
5555
with:
5656
name: ${{ github.ref_name }}-java-arm64-layer-arns-artifact
5757
path: arm64layerarns/

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ jobs:
3131
id: extract_tag
3232
run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/nodejs-v})"
3333
- name: Download amd64 layer artifacts
34-
uses: actions/download-artifact@v3
34+
uses: actions/download-artifact@v4
3535
with:
3636
name: ${{ github.ref_name }}-nodejs-amd64-artifacts
3737
path: artifacts/
3838
- name: Download arm 64 layer artifacts
39-
uses: actions/download-artifact@v3
39+
uses: actions/download-artifact@v4
4040
with:
4141
name: ${{ github.ref_name }}-nodejs-arm64-artifacts
4242
path: artifacts/
4343
- name: Download sample-app artifacts
44-
uses: actions/download-artifact@v3
44+
uses: actions/download-artifact@v4
4545
with:
4646
name: sample-app-nodejs-amd64-artifacts
4747
path: artifacts/
4848
- name: Download amd64 Layer ARNs
49-
uses: actions/download-artifact@v3
49+
uses: actions/download-artifact@v4
5050
with:
5151
name: ${{ github.ref_name }}-nodejs-amd64-layer-arns-artifact
5252
path: amd64layerarns/
5353
- name: Download arm64 Layer ARNs
54-
uses: actions/download-artifact@v3
54+
uses: actions/download-artifact@v4
5555
with:
5656
name: ${{ github.ref_name }}-nodejs-arm64-layer-arns-artifact
5757
path: arm64layerarns/

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ jobs:
3131
id: extract_tag
3232
run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/python-v})"
3333
- name: Download amd64 layer artifacts
34-
uses: actions/download-artifact@v3
34+
uses: actions/download-artifact@v4
3535
with:
3636
name: ${{ github.ref_name }}-python-amd64-artifacts
3737
path: artifacts/
3838
- name: Download arm64 layer artifacts
39-
uses: actions/download-artifact@v3
39+
uses: actions/download-artifact@v4
4040
with:
4141
name: ${{ github.ref_name }}-python-arm64-artifacts
4242
path: artifacts/
4343
- name: Download sample-app artifacts
44-
uses: actions/download-artifact@v3
44+
uses: actions/download-artifact@v4
4545
with:
4646
name: sample-app-python-amd64-artifacts
4747
path: artifacts/
4848
- name: Download amd64 Layer ARNs
49-
uses: actions/download-artifact@v3
49+
uses: actions/download-artifact@v4
5050
with:
5151
name: ${{ github.ref_name }}-python-amd64-layer-arns-artifact
5252
path: amd64layerarns/
5353
- name: Download arm64 Layer ARNs
54-
uses: actions/download-artifact@v3
54+
uses: actions/download-artifact@v4
5555
with:
5656
name: ${{ github.ref_name }}-python-arm64-layer-arns-artifact
5757
path: arm64layerarns/

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
python-version: '3.9'
9696
- name: Download sample-app artifact
97-
uses: actions/download-artifact@v3
97+
uses: actions/download-artifact@v4
9898
with:
9999
name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts
100100
path: ~/artifact

0 commit comments

Comments
 (0)