Skip to content

Commit 399f8a5

Browse files
bnusunnybnusunny
authored
Merge branch 'main' into ci/dependabot-grouping-and-targeted-example-verification
2 parents bb4e344 + bcd79a4 commit 399f8a5

6 files changed

Lines changed: 55 additions & 24 deletions

File tree

‎.github/workflows/docs.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ jobs:
2626
- name: Install mdBook
2727
run: |
2828
mkdir -p $HOME/bin
29-
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.40/mdbook-v0.4.40-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C $HOME/bin
29+
# -f so an HTTP error is an error: without it curl writes the error page to
30+
# the output file and exits 0, and tar then fails with "not in gzip format"
31+
# — the same misleading failure this commit set out to remove. It is also
32+
# what lets --retry see a 5xx as retryable at all.
33+
curl --retry 5 --retry-all-errors --retry-delay 5 -sSLf \
34+
https://github.com/rust-lang/mdBook/releases/download/v0.4.40/mdbook-v0.4.40-x86_64-unknown-linux-gnu.tar.gz \
35+
-o /tmp/mdbook.tar.gz
36+
tar -xz -C $HOME/bin -f /tmp/mdbook.tar.gz
3037
echo "$HOME/bin" >> $GITHUB_PATH
3138
3239
- name: Build book

‎.github/workflows/merge.yaml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ jobs:
3636
uses: Swatinem/rust-cache@v2
3737

3838
- name: Install cargo-nextest
39-
run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
39+
# Retried, and downloaded to a file rather than piped into tar: the default
40+
# shell has no pipefail, so curl's exit status was discarded and a transient
41+
# connection reset surfaced as an unrecoverable tar error.
42+
run: |
43+
curl --retry 5 --retry-all-errors --retry-delay 5 -LsSf \
44+
https://get.nexte.st/latest/linux -o /tmp/cargo-nextest.tar.gz
45+
tar zxf /tmp/cargo-nextest.tar.gz -C "${CARGO_HOME:-$HOME/.cargo}/bin"
4046
4147
- name: linting
4248
run: |
@@ -271,7 +277,13 @@ jobs:
271277
uses: Swatinem/rust-cache@v2
272278

273279
- name: Install cargo-nextest
274-
run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
280+
# Retried, and downloaded to a file rather than piped into tar: the default
281+
# shell has no pipefail, so curl's exit status was discarded and a transient
282+
# connection reset surfaced as an unrecoverable tar error.
283+
run: |
284+
curl --retry 5 --retry-all-errors --retry-delay 5 -LsSf \
285+
https://get.nexte.st/latest/linux -o /tmp/cargo-nextest.tar.gz
286+
tar zxf /tmp/cargo-nextest.tar.gz -C "${CARGO_HOME:-$HOME/.cargo}/bin"
275287
276288
- uses: actions/setup-python@v4
277289
with:
@@ -334,7 +346,13 @@ jobs:
334346
uses: Swatinem/rust-cache@v2
335347

336348
- name: Install cargo-nextest
337-
run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
349+
# Retried, and downloaded to a file rather than piped into tar: the default
350+
# shell has no pipefail, so curl's exit status was discarded and a transient
351+
# connection reset surfaced as an unrecoverable tar error.
352+
run: |
353+
curl --retry 5 --retry-all-errors --retry-delay 5 -LsSf \
354+
https://get.nexte.st/latest/linux -o /tmp/cargo-nextest.tar.gz
355+
tar zxf /tmp/cargo-nextest.tar.gz -C "${CARGO_HOME:-$HOME/.cargo}/bin"
338356
339357
- uses: actions/setup-python@v4
340358
with:

‎.github/workflows/pr.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ jobs:
2828
uses: Swatinem/rust-cache@v2
2929

3030
- name: Install cargo-nextest
31-
run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
31+
# Retried, and downloaded to a file rather than piped into tar: the default
32+
# shell has no pipefail, so curl's exit status was discarded and a transient
33+
# connection reset surfaced as an unrecoverable tar error.
34+
run: |
35+
curl --retry 5 --retry-all-errors --retry-delay 5 -LsSf \
36+
https://get.nexte.st/latest/linux -o /tmp/cargo-nextest.tar.gz
37+
tar zxf /tmp/cargo-nextest.tar.gz -C "${CARGO_HOME:-$HOME/.cargo}/bin"
3238
3339
- name: linting
3440
run: |

‎.github/workflows/release.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ jobs:
3232
uses: Swatinem/rust-cache@v2
3333

3434
- name: Install cargo-nextest
35-
run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
35+
# Retried, and downloaded to a file rather than piped into tar: the default
36+
# shell has no pipefail, so curl's exit status was discarded and a transient
37+
# connection reset surfaced as an unrecoverable tar error.
38+
run: |
39+
curl --retry 5 --retry-all-errors --retry-delay 5 -LsSf \
40+
https://get.nexte.st/latest/linux -o /tmp/cargo-nextest.tar.gz
41+
tar zxf /tmp/cargo-nextest.tar.gz -C "${CARGO_HOME:-$HOME/.cargo}/bin"
3642
3743
- name: linting
3844
run: |

‎template-arm64.yaml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,10 @@ Resources:
3939
Type: String
4040
Value: !Ref LambdaAdapterLayerArm64
4141

42-
LambdaAdapterLayerArm64VersionParameter:
43-
Type: AWS::SSM::Parameter
44-
DeletionPolicy: Retain
45-
UpdateReplacePolicy: Retain
46-
Properties:
47-
Name: !Sub '/lambda-web-adapter/layer/arm64/${CargoPkgVersion}'
48-
Description: !Sub 'Layer ARN for the latest Lambda Web Adapter Arm64 Layer: ${CargoPkgVersion}'
49-
Type: String
50-
Value: !Ref LambdaAdapterLayerArm64
42+
# A per-version parameter (/lambda-web-adapter/layer/arm64/<CargoPkgVersion>) used to
43+
# live here. See the matching comment in template-x86_64.yaml for why it was removed:
44+
# a Name change replaces the parameter, and UpdateReplacePolicy: Retain orphaned the
45+
# old name, so re-deploying an already-used version failed with AlreadyExists.
5146

5247
Outputs:
5348
LambdaAdapterLayerArm64Arn:

‎template-x86_64.yaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,14 @@ Resources:
3939
Type: String
4040
Value: !Ref LambdaAdapterLayerX86
4141

42-
LambdaAdapterLayerArm64VersionParameter:
43-
Type: AWS::SSM::Parameter
44-
DeletionPolicy: Retain
45-
UpdateReplacePolicy: Retain
46-
Properties:
47-
Name: !Sub '/lambda-web-adapter/layer/x86_64/${CargoPkgVersion}'
48-
Description: !Sub 'Layer ARN for the latest Lambda Web Adapter X86_64 Layer: ${CargoPkgVersion}'
49-
Type: String
50-
Value: !Ref LambdaAdapterLayerX86
42+
# A per-version parameter (/lambda-web-adapter/layer/x86_64/<CargoPkgVersion>) used
43+
# to live here. It was removed: because CloudFormation replaces a parameter when its
44+
# Name changes, and UpdateReplacePolicy was Retain, every version bump orphaned the
45+
# previous name. Deploying a version whose name had already been orphaned — after the
46+
# v1.1.0 revert, or on any re-release — then failed with AlreadyExists and wedged
47+
# every merge to main. Existing per-version parameters are retained, and the layer's
48+
# Description still records the version, so `aws lambda list-layer-versions` maps a
49+
# version to its layer ARN.
5150

5251
Outputs:
5352
LambdaAdapterLayerX86Arn:

0 commit comments

Comments
 (0)