Skip to content

Commit 829b27c

Browse files
aws-sam-cli-botaws-sam-cli-bot
committed
Merge branch 'develop'
2 parents 4acd8f8 + 1d369d3 commit 829b27c

File tree

8 files changed

+173
-175
lines changed

8 files changed

+173
-175
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
run: make func-test
8181

8282
node-integration:
83-
name: ${{ matrix.os }} / ${{ matrix.python }} / node / npm ${{ matrix.npm }}.x
83+
name: ${{ matrix.os }} / ${{ matrix.python }} / node ${{ matrix.nodejs }} / npm ${{ matrix.npm }}.x
8484
if: github.repository_owner == 'aws'
8585
runs-on: ${{ matrix.os }}
8686
strategy:
@@ -90,33 +90,32 @@ jobs:
9090
- ubuntu-latest
9191
- windows-latest
9292
python:
93-
- "3.9"
94-
- "3.10"
95-
- "3.11"
96-
- "3.12"
9793
- "3.13"
98-
- "3.14"
9994
npm:
10095
- 8
10196
- 9
10297
- 10
10398
- 11
99+
nodejs:
100+
- 20
101+
- 22
102+
- 24
104103
steps:
105104
- uses: actions/checkout@v5
106105
- uses: actions/setup-python@v6
107106
with:
108107
python-version: ${{ matrix.python }}
109108
- uses: actions/setup-node@v6
110109
with:
111-
node-version: 22
110+
node-version: ${{ matrix.nodejs }}
112111
- if: ${{ matrix.npm }}
113112
run: npm install -g npm@${{ matrix.npm }}
114113
- run: npm --version
115114
- run: make init
116115
- run: pytest -vv tests/integration/workflows/nodejs_npm
117116

118117
node-esbuild-integration:
119-
name: ${{ matrix.os }} / ${{ matrix.python }} / esbuild / npm ${{ matrix.npm }}.x
118+
name: ${{ matrix.os }} / ${{ matrix.python }} / esbuild / node ${{ matrix.nodejs }} / npm ${{ matrix.npm }}.x
120119
if: github.repository_owner == 'aws'
121120
runs-on: ${{ matrix.os }}
122121
strategy:
@@ -126,25 +125,24 @@ jobs:
126125
- ubuntu-latest
127126
- windows-latest
128127
python:
129-
- "3.9"
130-
- "3.10"
131-
- "3.11"
132-
- "3.12"
133128
- "3.13"
134-
- "3.14"
135129
npm:
136130
- 8
137131
- 9
138132
- 10
139133
- 11
134+
nodejs:
135+
- 20
136+
- 22
137+
- 24
140138
steps:
141139
- uses: actions/checkout@v5
142140
- uses: actions/setup-python@v6
143141
with:
144142
python-version: ${{ matrix.python }}
145143
- uses: actions/setup-node@v6
146144
with:
147-
node-version: 22
145+
node-version: ${{ matrix.nodejs }}
148146
- if: ${{ matrix.npm }}
149147
run: npm install -g npm@${{ matrix.npm }}
150148
- run: npm --version
@@ -162,12 +160,7 @@ jobs:
162160
- ubuntu-latest
163161
- windows-latest
164162
python:
165-
- "3.9"
166-
- "3.10"
167-
- "3.11"
168-
- "3.12"
169163
- "3.13"
170-
- "3.14"
171164
steps:
172165
- uses: actions/checkout@v5
173166
- uses: actions/setup-python@v6
@@ -190,12 +183,7 @@ jobs:
190183
- ubuntu-latest
191184
- windows-latest
192185
python:
193-
- "3.9"
194-
- "3.10"
195-
- "3.11"
196-
- "3.12"
197186
- "3.13"
198-
- "3.14"
199187
java:
200188
- "21"
201189
- "25"
@@ -224,12 +212,7 @@ jobs:
224212
- ubuntu-latest
225213
- windows-latest
226214
python:
227-
- "3.9"
228-
- "3.10"
229-
- "3.11"
230-
- "3.12"
231215
- "3.13"
232-
- "3.14"
233216
java:
234217
- "21"
235218
- "25"
@@ -256,12 +239,7 @@ jobs:
256239
- ubuntu-latest
257240
- windows-latest
258241
python:
259-
- "3.9"
260-
- "3.10"
261-
- "3.11"
262-
- "3.12"
263242
- "3.13"
264-
- "3.14"
265243
steps:
266244
- uses: actions/checkout@v5
267245
- uses: actions/setup-python@v6
@@ -310,12 +288,7 @@ jobs:
310288
- ubuntu-latest
311289
- windows-latest
312290
python:
313-
- "3.9"
314-
- "3.10"
315-
- "3.11"
316-
- "3.12"
317291
- "3.13"
318-
- "3.14"
319292
steps:
320293
- uses: actions/checkout@v5
321294
- uses: actions/setup-python@v6
@@ -338,12 +311,7 @@ jobs:
338311
- ubuntu-latest
339312
- windows-latest
340313
python:
341-
- "3.9"
342-
- "3.10"
343-
- "3.11"
344-
- "3.12"
345314
- "3.13"
346-
- "3.14"
347315
steps:
348316
- uses: actions/checkout@v5
349317
- uses: actions/setup-python@v6
@@ -368,12 +336,7 @@ jobs:
368336
- ubuntu-latest
369337
- windows-latest
370338
python:
371-
- "3.9"
372-
- "3.10"
373-
- "3.11"
374-
- "3.12"
375339
- "3.13"
376-
- "3.14"
377340
rust:
378341
- stable
379342
steps:

‎aws_lambda_builders/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# Changing version will trigger a new release!
66
# Please make the version change as the last step of your development.
77

8-
__version__ = "1.59.0"
8+
__version__ = "1.60.0"
99
RPC_PROTOCOL_VERSION = "0.3"

‎aws_lambda_builders/supported_runtimes.py‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
"""
2+
Centralized definition of supported AWS Lambda runtimes.
3+
4+
This module provides a single source of truth for all supported runtimes
5+
across the aws-lambda-builders package.
6+
"""
7+
8+
from aws_lambda_builders.architecture import ARM64, X86_64
9+
10+
# Node.js runtimes
11+
NODEJS_RUNTIMES = [
12+
"nodejs16.x",
13+
"nodejs18.x",
14+
"nodejs20.x",
15+
"nodejs22.x",
16+
"nodejs24.x",
17+
]
18+
19+
# Python runtimes
20+
PYTHON_RUNTIMES = [
21+
"python3.8",
22+
"python3.9",
23+
"python3.10",
24+
"python3.11",
25+
"python3.12",
26+
"python3.13",
27+
"python3.14",
28+
]
29+
30+
# Ruby runtimes
31+
RUBY_RUNTIMES = [
32+
"ruby3.2",
33+
"ruby3.3",
34+
"ruby3.4",
35+
]
36+
37+
# Java runtimes
38+
JAVA_RUNTIMES = [
39+
"java8",
40+
"java11",
41+
"java17",
42+
"java21",
43+
"java25",
44+
]
45+
46+
# Go runtimes
47+
GO_RUNTIMES = [
48+
"go1.x",
49+
]
50+
51+
# .NET runtimes
52+
DOTNET_RUNTIMES = [
53+
"dotnet6",
54+
"dotnet8",
55+
]
56+
57+
# Custom runtimes
58+
CUSTOM_RUNTIMES = ["provided", "provided.al2", "provided.al2023"]
59+
60+
# Combined list of all supported runtimes
61+
ALL_RUNTIMES = (
62+
NODEJS_RUNTIMES + PYTHON_RUNTIMES + RUBY_RUNTIMES + JAVA_RUNTIMES + GO_RUNTIMES + DOTNET_RUNTIMES + CUSTOM_RUNTIMES
63+
)
64+
65+
# Runtime to architecture mapping
66+
# All current runtimes support both ARM64 and X86_64
67+
RUNTIME_ARCHITECTURES = {runtime: [ARM64, X86_64] for runtime in ALL_RUNTIMES}

‎aws_lambda_builders/validator.py‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,11 @@
44

55
import logging
66

7-
from aws_lambda_builders.architecture import ARM64, X86_64
87
from aws_lambda_builders.exceptions import UnsupportedArchitectureError, UnsupportedRuntimeError
8+
from aws_lambda_builders.supported_runtimes import RUNTIME_ARCHITECTURES as SUPPORTED_RUNTIMES
99

1010
LOG = logging.getLogger(__name__)
1111

12-
SUPPORTED_RUNTIMES = {
13-
"nodejs16.x": [ARM64, X86_64],
14-
"nodejs18.x": [ARM64, X86_64],
15-
"nodejs20.x": [ARM64, X86_64],
16-
"nodejs22.x": [ARM64, X86_64],
17-
"python3.8": [ARM64, X86_64],
18-
"python3.9": [ARM64, X86_64],
19-
"python3.10": [ARM64, X86_64],
20-
"python3.11": [ARM64, X86_64],
21-
"python3.12": [ARM64, X86_64],
22-
"python3.13": [ARM64, X86_64],
23-
"python3.14": [ARM64, X86_64],
24-
"ruby3.2": [ARM64, X86_64],
25-
"ruby3.3": [ARM64, X86_64],
26-
"ruby3.4": [ARM64, X86_64],
27-
"java8": [ARM64, X86_64],
28-
"java11": [ARM64, X86_64],
29-
"java17": [ARM64, X86_64],
30-
"java21": [ARM64, X86_64],
31-
"java25": [ARM64, X86_64],
32-
"go1.x": [ARM64, X86_64],
33-
"dotnet6": [ARM64, X86_64],
34-
"dotnet8": [ARM64, X86_64],
35-
"provided": [ARM64, X86_64],
36-
}
37-
3812

3913
class RuntimeValidator(object):
4014
def __init__(self, runtime, architecture):

‎tests/integration/workflows/dotnet_clipackage/test_dotnet.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def test_with_defaults_file_arm64(self, runtime, version, test_project):
137137

138138
@parameterized.expand(
139139
[
140-
("dotnet6", "6.0", "CustomRuntime6"),
140+
# ("dotnet6", "6.0", "CustomRuntime6"),
141141
("dotnet8", "8.0", "CustomRuntime8"),
142142
]
143143
)

0 commit comments

Comments
 (0)