Skip to content

Commit 5c6a2bc

Browse files
Merge from aws/aws-sam-cli/develop
2 parents 5458b1f + 8f25f26 commit 5c6a2bc

30 files changed

Lines changed: 588 additions & 362 deletions

.github/workflows/automated-updates-to-sam-cli.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
fi
2525
2626
- name: Checkout App Templates
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
with:
2929
repository: aws/aws-sam-cli-app-templates
3030
path: aws-sam-cli-app-templates
3131

3232
- name: Checkout SAM CLI
33-
uses: actions/checkout@v6
33+
uses: actions/checkout@v7
3434
with:
3535
repository: aws/aws-sam-cli
3636
path: aws-sam-cli
@@ -79,15 +79,15 @@ jobs:
7979
fi
8080
8181
- name: Checkout SAM
82-
uses: actions/checkout@v6
82+
uses: actions/checkout@v7
8383
with:
8484
repository: aws/serverless-application-model
8585
path: serverless-application-model
8686
ref: main
8787
fetch-depth: 0
8888

8989
- name: Checkout SAM CLI
90-
uses: actions/checkout@v6
90+
uses: actions/checkout@v7
9191
with:
9292
repository: aws/aws-sam-cli
9393
path: aws-sam-cli
@@ -148,15 +148,15 @@ jobs:
148148
fi
149149
150150
- name: Checkout Lambda Builders
151-
uses: actions/checkout@v6
151+
uses: actions/checkout@v7
152152
with:
153153
repository: aws/aws-lambda-builders
154154
path: aws-lambda-builders
155155
ref: main
156156
fetch-depth: 0
157157

158158
- name: Checkout SAM CLI
159-
uses: actions/checkout@v6
159+
uses: actions/checkout@v7
160160
with:
161161
repository: aws/aws-sam-cli
162162
path: aws-sam-cli

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
mkdir "D:\\Temp"
6565
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
6666
if: ${{ matrix.os == 'windows-latest' }}
67-
- uses: actions/checkout@v6
67+
- uses: actions/checkout@v7
6868
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6969
with:
7070
python-version: ${{ matrix.python }}
@@ -82,7 +82,7 @@ jobs:
8282
contents: read
8383
runs-on: ubuntu-latest
8484
steps:
85-
- uses: actions/checkout@v6
85+
- uses: actions/checkout@v7
8686
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
8787
with:
8888
python-version: "3.11"
@@ -152,7 +152,7 @@ jobs:
152152
tests_config:
153153
name: "durable-functions"
154154
steps:
155-
- uses: actions/checkout@v6
155+
- uses: actions/checkout@v7
156156
- name: Set TEMP to D:/Temp
157157
run: |
158158
mkdir "D:\\Temp"
@@ -241,7 +241,7 @@ jobs:
241241
params: "-n 4 tests/smoke tests/functional"
242242
env_vars: "fourth-quarter"
243243
steps:
244-
- uses: actions/checkout@v6
244+
- uses: actions/checkout@v7
245245
- name: Set TEMP to D:/Temp
246246
run: |
247247
mkdir "D:\\Temp"
@@ -273,7 +273,7 @@ jobs:
273273
- ubuntu-latest
274274
- windows-latest
275275
steps:
276-
- uses: actions/checkout@v6
276+
- uses: actions/checkout@v7
277277
- name: Set TEMP to D:/Temp
278278
run: |
279279
mkdir "D:\\Temp"

.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@v6
45+
uses: actions/checkout@v7
4646

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

.github/workflows/integration-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
fi
115115
116116
- name: Checkout code
117-
uses: actions/checkout@v6
117+
uses: actions/checkout@v7
118118
with:
119119
ref: ${{ (env.TEST_TYPE == 'nightly-release' && github.event.action == 'published') && 'nightly-builds' || (github.event_name == 'schedule' && 'develop' || github.ref) }}
120120

@@ -243,7 +243,7 @@ jobs:
243243
echo "SAM_CLI_DEV=" >> $GITHUB_ENV
244244
245245
- name: Configure AWS credentials via OIDC
246-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
246+
uses: aws-actions/configure-aws-credentials@254c19bd240aabef8777f48595e9d2d7b972184b # v6
247247
with:
248248
role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
249249
aws-region: us-east-1
@@ -451,14 +451,14 @@ jobs:
451451

452452
- name: Re-authenticate with OIDC for cleanup
453453
if: always() && env.SCRIPT_PY != ''
454-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
454+
uses: aws-actions/configure-aws-credentials@254c19bd240aabef8777f48595e9d2d7b972184b # v6
455455
with:
456456
role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
457457
aws-region: us-east-1
458458

459459
- name: Assume test reporting role
460460
if: always() && env.SCRIPT_PY != ''
461-
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6
461+
uses: aws-actions/configure-aws-credentials@254c19bd240aabef8777f48595e9d2d7b972184b # v6
462462
with:
463463
role-to-assume: ${{ secrets.TESTREPORTING_ARN }}
464464
aws-region: us-east-1

.github/workflows/sync-to-mirror-repo.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/update-reproducibles.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: github.repository_owner == 'aws' && github.event.pull_request.head.repo.full_name == github.repository
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v6
21+
- uses: actions/checkout@v7
2222
with:
2323
ref: ${{ github.head_ref }}
2424
token: ${{ secrets.GITHUB_TOKEN }}
@@ -42,7 +42,7 @@ jobs:
4242
if: github.repository_owner == 'aws' && github.event.pull_request.head.repo.full_name != github.repository
4343
runs-on: ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@v6
45+
- uses: actions/checkout@v7
4646
- uses: actions/setup-python@v6
4747
with:
4848
python-version: "3.11"

.github/workflows/validate_pyinstaller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v7
2323
- name: Make installer script executable
2424
run: chmod +x ./installer/pyinstaller/build-linux.sh
2525
- name: Build PyInstaller in manylinux container
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
fail-fast: false
5454
steps:
55-
- uses: actions/checkout@v6
55+
- uses: actions/checkout@v7
5656
- uses: actions/setup-python@v6
5757
with:
5858
python-version: "3.11"

installer/pyinstaller/build-linux.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ ln -sf /opt/openssl/lib64 /opt/openssl/lib
5858
cd ../../
5959

6060
echo "Building zlib"
61-
curl https://www.zlib.net/zlib-${zlib_version}.tar.gz --output zlib.tar.gz
61+
curl -fL "https://www.zlib.net/zlib-${zlib_version}.tar.gz" --output zlib.tar.gz || \
62+
curl -fL "https://github.com/madler/zlib/releases/download/v${zlib_version}/zlib-${zlib_version}.tar.gz" --output zlib.tar.gz
6263
tar xvf zlib.tar.gz
6364
cd zlib-${zlib_version}
6465
./configure && make -j8 && make -j8 install

pyproject.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ dependencies = [
3535
"chevron~=0.12",
3636
"click==8.1.8",
3737
"Flask<3.2",
38-
"boto3[crt]==1.43.7",
38+
"boto3[crt]==1.43.38",
3939
"jmespath~=1.1.0",
4040
"ruamel_yaml~=0.19.1",
4141
"PyYAML~=6.0",
4242
"cookiecutter>=2.6,<2.8",
43-
"aws-sam-translator==1.110.0",
43+
"aws-sam-translator==1.111.0",
4444
# docker minor version updates can include breaking changes. Auto update micro version only.
4545
"docker~=7.1.0",
4646
"dateparser~=1.3",
@@ -56,7 +56,7 @@ dependencies = [
5656
# regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac
5757
"regex!=2021.10.8",
5858
"tzlocal==5.3.1",
59-
"cfn-lint>=1.51.3,<1.52",
59+
"cfn-lint>=1.51.3,<1.53",
6060
"boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0",
6161
"python-dotenv>=1.0,<1.3",
6262
]
@@ -74,25 +74,25 @@ dev = [
7474
"types-PyYAML==6.0.12.20260518",
7575
"types-chevron==0.14.2.20260408",
7676
"types-psutil==7.2.2.20260518",
77-
"types-setuptools==82.0.0.20260508",
77+
"types-setuptools==82.0.0.20260518",
7878
"types-Pygments==2.20.0.20260518",
7979
"types-colorama==0.4.15.20260508",
80-
"types-dateparser==1.4.0.20260508",
80+
"types-dateparser==1.4.1.20260617",
8181
"types-docutils==0.22.3.20260518",
8282
"types-jsonschema==4.26.0.20260508",
8383
"types-pyOpenSSL==24.1.0.20240722",
84-
"types-requests==2.33.0.20260513",
84+
"types-requests==2.33.0.20260518",
8585
"types-urllib3==1.26.25.14",
8686
"pytest==9.0.3",
8787
"parameterized==0.9.0",
8888
"pytest-xdist==3.8.0",
8989
"pytest-forked==1.6.0",
9090
"pytest-timeout==2.4.0",
91-
"pytest-rerunfailures==16.2",
91+
"pytest-rerunfailures==16.3",
9292
"pytest-metadata==3.1.1",
9393
"pytest-json-report-wip==1.5.1",
9494
"filelock==3.29.0",
95-
"black==26.5.0",
95+
"black==26.5.1",
9696
"psutil==7.2.2",
9797
"chardet<6",
9898
]

0 commit comments

Comments
 (0)