Skip to content

Commit c567e74

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-7
2 parents 7fc2e7b + 3d9661e commit c567e74

File tree

76 files changed

+1908
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1908
-146
lines changed
Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# This workflow will be triggered if there will be changes to aws-lambda-java-core
2-
# package and it builds the package and the packages that depend on it.
2+
# package and it builds the package.
33

44
name: Java CI aws-lambda-java-core
55

66
on:
7+
workflow_dispatch:
78
push:
89
branches: [ main ]
910
paths:
@@ -23,24 +24,13 @@ jobs:
2324
runs-on: ubuntu-latest
2425

2526
steps:
26-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2728
- name: Set up JDK 1.8
28-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
2930
with:
3031
java-version: 8
3132
distribution: corretto
32-
33-
# Install base module
33+
cache: maven
34+
3435
- name: Install core with Maven
3536
run: mvn -B install --file aws-lambda-java-core/pom.xml
36-
37-
# Package modules that depend on base module
38-
- name: Package log4j2 with Maven
39-
run: mvn -B package --file aws-lambda-java-log4j2/pom.xml
40-
41-
# Test Runtime Interface Client
42-
- name: Run 'pr' target
43-
working-directory: ./aws-lambda-java-runtime-interface-client
44-
run: make pr
45-
env:
46-
IS_JAVA_8: true

.github/workflows/aws-lambda-java-events-sdk-transformer.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
# This workflow will be triggered if there will be changes to
2-
# aws-lambda-java-events-sdk-transformer package and it builds the package.
1+
# This workflow will be triggered if there will be changes to
2+
# aws-lambda-java-events-sdk-transformer package or its dependency (events),
3+
# and it builds the package.
34

45
name: Java CI aws-lambda-java-events-sdk-transformer
56

67
on:
8+
workflow_dispatch:
79
push:
810
branches: [ main ]
911
paths:
1012
- 'aws-lambda-java-events-sdk-transformer/**'
13+
- 'aws-lambda-java-events/**'
1114
pull_request:
1215
branches: [ '*' ]
1316
paths:
1417
- 'aws-lambda-java-events-sdk-transformer/**'
18+
- 'aws-lambda-java-events/**'
1519
- '.github/workflows/aws-lambda-java-events-sdk-transformer.yml'
1620

1721
permissions:
@@ -23,17 +27,17 @@ jobs:
2327
runs-on: ubuntu-latest
2428

2529
steps:
26-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
2731
- name: Set up JDK 1.8
28-
uses: actions/setup-java@v4
32+
uses: actions/setup-java@v5
2933
with:
3034
java-version: 8
3135
distribution: corretto
36+
cache: maven
3237

33-
# Install base module
38+
# Install dependency
3439
- name: Install events with Maven
3540
run: mvn -B install --file aws-lambda-java-events/pom.xml
3641
# Package target module
3742
- name: Package events-sdk-transformer with Maven
3843
run: mvn -B package --file aws-lambda-java-events-sdk-transformer/pom.xml
39-
Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# This workflow will be triggered if there will be changes to aws-lambda-java-events
2-
# package and it builds the package and the packages that depend on it.
2+
# package and it builds the package.
33

44
name: Java CI aws-lambda-java-events
55

66
on:
7+
workflow_dispatch:
78
push:
89
branches: [ main ]
910
paths:
@@ -23,20 +24,13 @@ jobs:
2324
runs-on: ubuntu-latest
2425

2526
steps:
26-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2728
- name: Set up JDK 1.8
28-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
2930
with:
3031
java-version: 8
3132
distribution: corretto
32-
33-
# Install base module
33+
cache: maven
34+
3435
- name: Install events with Maven
3536
run: mvn -B install --file aws-lambda-java-events/pom.xml
36-
37-
# Package modules that depend on base module
38-
- name: Package serialization with Maven
39-
run: mvn -B package --file aws-lambda-java-serialization/pom.xml
40-
- name: Package events-sdk-transformer with Maven
41-
run: mvn -B package --file aws-lambda-java-events-sdk-transformer/pom.xml
42-

.github/workflows/aws-lambda-java-log4j2.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
# This workflow will be triggered if there will be changes to
2-
# aws-lambda-java-log4j2 package and it builds the package.
1+
# This workflow will be triggered if there will be changes to
2+
# aws-lambda-java-log4j2 package or its dependency (core), and it builds the package.
33

44
name: Java CI aws-lambda-java-log4j2
55

66
on:
77
push:
8+
workflow_dispatch:
89
branches: [ main ]
910
paths:
1011
- 'aws-lambda-java-log4j2/**'
12+
- 'aws-lambda-java-core/**'
1113
pull_request:
1214
branches: [ '*' ]
1315
paths:
1416
- 'aws-lambda-java-log4j2/**'
17+
- 'aws-lambda-java-core/**'
1518
- '.github/workflows/aws-lambda-java-log4j2.yml'
1619

1720
permissions:
@@ -23,17 +26,17 @@ jobs:
2326
runs-on: ubuntu-latest
2427

2528
steps:
26-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
2730
- name: Set up JDK 1.8
28-
uses: actions/setup-java@v4
31+
uses: actions/setup-java@v5
2932
with:
3033
java-version: 8
3134
distribution: corretto
32-
33-
# Install base module
35+
cache: maven
36+
37+
# Install dependency
3438
- name: Install core with Maven
3539
run: mvn -B install --file aws-lambda-java-core/pom.xml
3640
# Package target module
3741
- name: Package log4j2 with Maven
3842
run: mvn -B package --file aws-lambda-java-log4j2/pom.xml
39-

.github/workflows/aws-lambda-java-profiler.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ jobs:
2222
contents: read
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626

2727
- name: Set up JDK
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
java-version: 21
3131
distribution: corretto
32+
cache: maven
3233

3334
- name: Issue AWS credentials
3435
uses: aws-actions/configure-aws-credentials@v4

.github/workflows/aws-lambda-java-serialization.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
# This workflow will be triggered if there will be changes to aws-lambda-java-serialization
2-
# package and it builds the package and the packages that depend on it.
1+
# This workflow will be triggered if there will be changes to aws-lambda-java-serialization
2+
# package or its dependency (events), and it builds the package.
33

44
name: Java CI aws-lambda-java-serialization
55

66
on:
7+
workflow_dispatch:
78
push:
89
branches: [ main ]
910
paths:
1011
- 'aws-lambda-java-serialization/**'
12+
- 'aws-lambda-java-events/**'
1113
pull_request:
1214
branches: [ '*' ]
1315
paths:
1416
- 'aws-lambda-java-serialization/**'
17+
- 'aws-lambda-java-events/**'
1518
- '.github/workflows/aws-lambda-java-serialization.yml'
1619

1720
permissions:
@@ -23,14 +26,15 @@ jobs:
2326
runs-on: ubuntu-latest
2427

2528
steps:
26-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
2730
- name: Set up JDK 1.8
28-
uses: actions/setup-java@v4
31+
uses: actions/setup-java@v5
2932
with:
3033
java-version: 8
3134
distribution: corretto
32-
33-
# Install base module
35+
cache: maven
36+
37+
# Install dependency
3438
- name: Install events with Maven
3539
run: mvn -B install --file aws-lambda-java-events/pom.xml
3640

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This workflow will be triggered if there will be changes to aws-lambda-java-tests
2-
# package and it builds the package and the packages that depend on it.
2+
# package or its dependencies (events, serialization), and it builds the package.
33

44
name: Java CI aws-lambda-java-tests
55

@@ -9,16 +9,14 @@ on:
99
branches: [ main ]
1010
paths:
1111
- 'aws-lambda-java-tests/**'
12-
- 'aws-lambda-java-runtime-interface-client/**'
13-
- 'aws-lambda-java-serialization/**'
1412
- 'aws-lambda-java-events/**'
13+
- 'aws-lambda-java-serialization/**'
1514
pull_request:
1615
branches: [ '*' ]
1716
paths:
1817
- 'aws-lambda-java-tests/**'
19-
- 'aws-lambda-java-runtime-interface-client/**'
20-
- 'aws-lambda-java-serialization/**'
2118
- 'aws-lambda-java-events/**'
19+
- 'aws-lambda-java-serialization/**'
2220
- '.github/workflows/aws-lambda-java-tests.yml'
2321

2422
permissions:
@@ -30,14 +28,15 @@ jobs:
3028
runs-on: ubuntu-latest
3129

3230
steps:
33-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3432
- name: Set up JDK 1.8
35-
uses: actions/setup-java@v4
33+
uses: actions/setup-java@v5
3634
with:
3735
java-version: 8
3836
distribution: corretto
39-
40-
# Install base module
37+
cache: maven
38+
39+
# Install dependencies
4140
- name: Install events with Maven
4241
run: mvn -B install --file aws-lambda-java-events/pom.xml
4342
- name: Install serialization with Maven
@@ -46,4 +45,3 @@ jobs:
4645
# Package target module
4746
- name: Package tests with Maven
4847
run: mvn -B package --file aws-lambda-java-tests/pom.xml
49-

.github/workflows/repo-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
IS_CONFIGURED: ${{ secrets.SOURCE_REPO != '' }}
2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
if: ${{ env.IS_CONFIGURED == 'true' }}
2525
- uses: repo-sync/github-sync@v2
2626
name: Sync repo to branch

.github/workflows/runtime-interface-client_merge_to_main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
name: Publish artifact for aws-lambda-java-runtime-interface-client
1212

1313
on:
14+
workflow_dispatch:
1415
push:
1516
branches: [ main ]
1617
paths:
1718
- 'aws-lambda-java-runtime-interface-client/**'
1819
- '.github/workflows/runtime-interface-client_*.yml'
19-
workflow_dispatch:
2020

2121
jobs:
2222

@@ -28,13 +28,14 @@ jobs:
2828
contents: read
2929

3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232

3333
- name: Set up JDK 1.8
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
java-version: 8
3737
distribution: corretto
38+
cache: maven
3839

3940
- name: Set up QEMU
4041
uses: docker/setup-qemu-action@v3

.github/workflows/runtime-interface-client_pr.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
# This workflow will be triggered if there will be changes to
2-
# aws-lambda-java-runtime-interface-client package and it builds the package.
1+
# This workflow will be triggered if there will be changes to
2+
# aws-lambda-java-runtime-interface-client package or its dependencies (core, serialization),
3+
# and it builds the package.
34

45
name: PR to runtime-interface-client
56

67
on:
8+
workflow_dispatch:
79
pull_request:
810
branches: [ '*' ]
911
paths:
1012
- 'aws-lambda-java-runtime-interface-client/**'
13+
- 'aws-lambda-java-core/**'
14+
- 'aws-lambda-java-serialization/**'
1115
- '.github/workflows/runtime-interface-client_*.yml'
1216

1317
permissions:
@@ -18,14 +22,15 @@ jobs:
1822
smoke-test:
1923
runs-on: ubuntu-latest
2024
steps:
21-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2226

2327
- name: Set up JDK 1.8
24-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2529
with:
2630
java-version: 8
2731
distribution: corretto
28-
32+
cache: maven
33+
2934
- name: Build and install core dependency locally
3035
working-directory: ./aws-lambda-java-core
3136
run: mvn clean install
@@ -39,17 +44,18 @@ jobs:
3944
run: make pr
4045
env:
4146
IS_JAVA_8: true
42-
47+
4348
build:
4449
runs-on: ubuntu-latest
4550
steps:
46-
- uses: actions/checkout@v5
51+
- uses: actions/checkout@v6
4752

4853
- name: Set up JDK 1.8
49-
uses: actions/setup-java@v4
54+
uses: actions/setup-java@v5
5055
with:
5156
java-version: 8
5257
distribution: corretto
58+
cache: maven
5359

5460
- name: Set up QEMU
5561
uses: docker/setup-qemu-action@v3
@@ -61,7 +67,7 @@ jobs:
6167

6268
- name: Available buildx platforms
6369
run: echo ${{ steps.buildx.outputs.platforms }}
64-
70+
6571
- name: Build and install core dependency locally
6672
working-directory: ./aws-lambda-java-core
6773
run: mvn clean install

0 commit comments

Comments
 (0)