Skip to content

Commit 4acd8f8

Browse files
aws-sam-cli-botaws-sam-cli-bot
committed
Merge branch 'develop'
2 parents 3ab7f50 + b2782ee commit 4acd8f8

File tree

17 files changed

+922
-91
lines changed

17 files changed

+922
-91
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
*Issue #, if available:*
22

3-
*Description of changes:*
3+
### Description of changes
4+
5+
### Description of how you validated changes
6+
7+
### Checklist
8+
9+
- [ ] Review the [generative AI contribution guidelines](https://github.com/aws/aws-lambda-builders/blob/develop/CONTRIBUTING.md#ai-usage)
410

511

612
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

‎.github/workflows/build.yml‎

Lines changed: 63 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,15 @@ jobs:
6363
- ubuntu-latest
6464
- windows-latest
6565
python:
66-
- "3.8"
6766
- "3.9"
6867
- "3.10"
68+
- "3.11"
69+
- "3.12"
70+
- "3.13"
71+
- "3.14"
6972
steps:
70-
- uses: actions/checkout@v4
71-
- uses: actions/setup-python@v5
73+
- uses: actions/checkout@v5
74+
- uses: actions/setup-python@v6
7275
with:
7376
python-version: ${{ matrix.python }}
7477
- name: Unit Testing
@@ -87,18 +90,23 @@ jobs:
8790
- ubuntu-latest
8891
- windows-latest
8992
python:
90-
- "3.8"
9193
- "3.9"
9294
- "3.10"
95+
- "3.11"
96+
- "3.12"
97+
- "3.13"
98+
- "3.14"
9399
npm:
94100
- 8
95101
- 9
102+
- 10
103+
- 11
96104
steps:
97-
- uses: actions/checkout@v4
98-
- uses: actions/setup-python@v5
105+
- uses: actions/checkout@v5
106+
- uses: actions/setup-python@v6
99107
with:
100108
python-version: ${{ matrix.python }}
101-
- uses: actions/setup-node@v4
109+
- uses: actions/setup-node@v6
102110
with:
103111
node-version: 22
104112
- if: ${{ matrix.npm }}
@@ -118,21 +126,23 @@ jobs:
118126
- ubuntu-latest
119127
- windows-latest
120128
python:
121-
- "3.8"
122129
- "3.9"
123130
- "3.10"
124131
- "3.11"
125132
- "3.12"
126133
- "3.13"
134+
- "3.14"
127135
npm:
128136
- 8
129137
- 9
138+
- 10
139+
- 11
130140
steps:
131-
- uses: actions/checkout@v4
132-
- uses: actions/setup-python@v5
141+
- uses: actions/checkout@v5
142+
- uses: actions/setup-python@v6
133143
with:
134144
python-version: ${{ matrix.python }}
135-
- uses: actions/setup-node@v4
145+
- uses: actions/setup-node@v6
136146
with:
137147
node-version: 22
138148
- if: ${{ matrix.npm }}
@@ -152,25 +162,25 @@ jobs:
152162
- ubuntu-latest
153163
- windows-latest
154164
python:
155-
- "3.8"
156165
- "3.9"
157166
- "3.10"
158167
- "3.11"
159168
- "3.12"
160169
- "3.13"
170+
- "3.14"
161171
steps:
162-
- uses: actions/checkout@v4
163-
- uses: actions/setup-python@v5
172+
- uses: actions/checkout@v5
173+
- uses: actions/setup-python@v6
164174
with:
165175
python-version: ${{ matrix.python }}
166-
- uses: actions/setup-go@v5
176+
- uses: actions/setup-go@v6
167177
with:
168178
go-version: '^1.16'
169179
- run: make init
170180
- run: pytest -vv tests/integration/workflows/go_modules
171181

172182
java-maven-integration:
173-
name: ${{ matrix.os }} / ${{ matrix.python }} / java maven
183+
name: ${{ matrix.os }} / ${{ matrix.python }} / java maven / java ${{ matrix.java }}
174184
if: github.repository_owner == 'aws'
175185
runs-on: ${{ matrix.os }}
176186
strategy:
@@ -180,26 +190,29 @@ jobs:
180190
- ubuntu-latest
181191
- windows-latest
182192
python:
183-
- "3.8"
184193
- "3.9"
185194
- "3.10"
186195
- "3.11"
187196
- "3.12"
188197
- "3.13"
198+
- "3.14"
199+
java:
200+
- "21"
201+
- "25"
189202
steps:
190-
- uses: actions/checkout@v4
191-
- uses: actions/setup-python@v5
203+
- uses: actions/checkout@v5
204+
- uses: actions/setup-python@v6
192205
with:
193206
python-version: ${{ matrix.python }}
194-
- uses: actions/setup-java@v4
207+
- uses: actions/setup-java@v5
195208
with:
196209
distribution: 'corretto'
197-
java-version: '21'
210+
java-version: ${{ matrix.java }}
198211
- run: make init
199212
- run: pytest -vv tests/integration/workflows/java_maven
200213

201214
java-gradle-integration:
202-
name: ${{ matrix.os }} / ${{ matrix.python }} / java gradle
215+
name: ${{ matrix.os }} / ${{ matrix.python }} / java gradle / java ${{ matrix.java }}
203216
if: github.repository_owner == 'aws'
204217
runs-on: ${{ matrix.os }}
205218
env:
@@ -211,21 +224,24 @@ jobs:
211224
- ubuntu-latest
212225
- windows-latest
213226
python:
214-
- "3.8"
215227
- "3.9"
216228
- "3.10"
217229
- "3.11"
218230
- "3.12"
219231
- "3.13"
232+
- "3.14"
233+
java:
234+
- "21"
235+
- "25"
220236
steps:
221-
- uses: actions/checkout@v4
222-
- uses: actions/setup-python@v5
237+
- uses: actions/checkout@v5
238+
- uses: actions/setup-python@v6
223239
with:
224240
python-version: ${{ matrix.python }}
225-
- uses: actions/setup-java@v4
241+
- uses: actions/setup-java@v5
226242
with:
227243
distribution: 'zulu'
228-
java-version: '21'
244+
java-version: ${{ matrix.java }}
229245
- run: make init
230246
- run: pytest -vv tests/integration/workflows/java_gradle
231247

@@ -240,14 +256,15 @@ jobs:
240256
- ubuntu-latest
241257
- windows-latest
242258
python:
243-
- "3.8"
244259
- "3.9"
245260
- "3.10"
246261
- "3.11"
247262
- "3.12"
263+
- "3.13"
264+
- "3.14"
248265
steps:
249-
- uses: actions/checkout@v4
250-
- uses: actions/setup-python@v5
266+
- uses: actions/checkout@v5
267+
- uses: actions/setup-python@v6
251268
with:
252269
python-version: ${{ matrix.python }}
253270
- run: make init
@@ -264,15 +281,15 @@ jobs:
264281
- ubuntu-latest
265282
- windows-latest
266283
python:
267-
- "3.8"
268284
- "3.9"
269285
- "3.10"
270286
- "3.11"
271287
- "3.12"
272288
- "3.13"
289+
- "3.14"
273290
steps:
274-
- uses: actions/checkout@v4
275-
- uses: actions/setup-python@v5
291+
- uses: actions/checkout@v5
292+
- uses: actions/setup-python@v6
276293
with:
277294
python-version: ${{ matrix.python }}
278295
- run: |
@@ -293,15 +310,15 @@ jobs:
293310
- ubuntu-latest
294311
- windows-latest
295312
python:
296-
- "3.8"
297313
- "3.9"
298314
- "3.10"
299315
- "3.11"
300316
- "3.12"
301317
- "3.13"
318+
- "3.14"
302319
steps:
303-
- uses: actions/checkout@v4
304-
- uses: actions/setup-python@v5
320+
- uses: actions/checkout@v5
321+
- uses: actions/setup-python@v6
305322
with:
306323
python-version: ${{ matrix.python }}
307324
- uses: ruby/setup-ruby@v1
@@ -321,15 +338,15 @@ jobs:
321338
- ubuntu-latest
322339
- windows-latest
323340
python:
324-
- "3.8"
325341
- "3.9"
326342
- "3.10"
327343
- "3.11"
328344
- "3.12"
329345
- "3.13"
346+
- "3.14"
330347
steps:
331-
- uses: actions/checkout@v4
332-
- uses: actions/setup-python@v5
348+
- uses: actions/checkout@v5
349+
- uses: actions/setup-python@v6
333350
with:
334351
python-version: ${{ matrix.python }}
335352
- run: make init
@@ -352,12 +369,16 @@ jobs:
352369
- windows-latest
353370
python:
354371
- "3.9"
355-
- "3.8"
372+
- "3.10"
373+
- "3.11"
374+
- "3.12"
375+
- "3.13"
376+
- "3.14"
356377
rust:
357378
- stable
358379
steps:
359-
- uses: actions/checkout@v4
360-
- uses: actions/setup-python@v5
380+
- uses: actions/checkout@v5
381+
- uses: actions/setup-python@v6
361382
with:
362383
python-version: ${{ matrix.python }}
363384

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL

‎.github/workflows/pr-labeler.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,22 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1515
apply-internal-external-label:
1616
permissions:
1717
pull-requests: write
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/github-script@v7
20+
- uses: actions/github-script@v8
2121
with:
2222
github-token: ${{secrets.GITHUB_TOKEN}}
2323
script: |
24-
const maintainers = ['jfuss', 'hoffa', 'awood45', 'aahung', 'hawflau', 'mndeveci', 'ssenchenko', 'qingchm', 'moelasmar', 'xazhao', 'mildaniel', 'marekaiv', 'torresxb1', 'lucashuy', 'hnnasit', 'sriram-mv', 'dependabot[bot]']
24+
const maintainers = ['seshubaws', 'valerena',
25+
'Vandita2020', 'roger-zhangg',
26+
'vicheey', 'bnusunny', 'tobixlea',
27+
'reedham-aws', 'licjun', 'dependabot[bot]']
2528
if (maintainers.includes(context.payload.sender.login)) {
2629
github.rest.issues.addLabels({
2730
issue_number: context.issue.number,

‎CONTRIBUTING.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ reported the issue. Please try to include as much information as you can. Detail
1919
* Any modifications you've made relevant to the bug
2020
* Anything unusual about your environment or deployment
2121

22+
## AI Usage
23+
24+
While using generative AI is allowed when contributing to this project, please keep the following points in mind:
25+
26+
* Review all code yourself before you submit it.
27+
* Understand all the code you have submitted in order to answer any questions the maintainers could have when reviewing your PR.
28+
* Avoid being overly verbose in code and testing - extra code can be hard to review.
29+
* For example, avoid writing unit tests that duplicate existing ones, or test libraries that you're using.
30+
* Keep PR descriptions, comments, and follow ups concise.
31+
* Ensure AI-generated code meets the same quality standards as human-written code.
2232

2333
## Contributing via Pull Requests
2434
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:

‎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.58.0"
8+
__version__ = "1.59.0"
99
RPC_PROTOCOL_VERSION = "0.3"

‎aws_lambda_builders/validator.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
"python3.11": [ARM64, X86_64],
2121
"python3.12": [ARM64, X86_64],
2222
"python3.13": [ARM64, X86_64],
23+
"python3.14": [ARM64, X86_64],
2324
"ruby3.2": [ARM64, X86_64],
2425
"ruby3.3": [ARM64, X86_64],
2526
"ruby3.4": [ARM64, X86_64],
2627
"java8": [ARM64, X86_64],
2728
"java11": [ARM64, X86_64],
2829
"java17": [ARM64, X86_64],
2930
"java21": [ARM64, X86_64],
31+
"java25": [ARM64, X86_64],
3032
"go1.x": [ARM64, X86_64],
3133
"dotnet6": [ARM64, X86_64],
3234
"dotnet8": [ARM64, X86_64],

‎aws_lambda_builders/workflows/python_pip/DESIGN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def build_dependencies(artifacts_dir_path,
4949
5050
:type runtime: str
5151
:param runtime: Python version to build dependencies for. This can
52-
either be python3.8, python3.9, python3.10, python3.11, python3.12 or python3.13. These are
52+
either be python3.8, python3.9, python3.10, python3.11, python3.12, python3.13 or python3.14. These are
5353
currently the only supported values.
5454
5555
:type ui: :class:`lambda_builders.actions.python_pip.utils.UI`

0 commit comments

Comments
 (0)