Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 945d0d4

Browse files
authoredMar 7, 2025··
Merge branch 'main' into sebsto/new-plugin-proposal
2 parents 5444714 + ae06d59 commit 945d0d4

File tree

136 files changed

+959
-866
lines changed

Some content is hidden

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

136 files changed

+959
-866
lines changed
 

‎.github/workflows/integration_tests.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ on:
3838
required: true
3939
matrix_linux_swift_container_image:
4040
type: string
41-
description: "Container image for the matrix job. Defaults to matching latest Swift Ubuntu image."
42-
default: "swift:amazonlinux2"
41+
description: "Container image for the matrix job. Defaults to matching latest Swift 6.1 Amazon Linux 2 image."
42+
default: "swiftlang/swift:nightly-6.1-amazonlinux2"
4343

4444
## We are cancelling previously triggered workflow runs
4545
concurrency:
@@ -59,7 +59,6 @@ jobs:
5959
# We are using only one Swift version
6060
swift:
6161
- image: ${{ inputs.matrix_linux_swift_container_image }}
62-
swift_version: "6.0.3-amazonlinux2"
6362
container:
6463
image: ${{ matrix.swift.image }}
6564
steps:
@@ -93,7 +92,6 @@ jobs:
9392
- name: Run matrix job
9493
working-directory: ${{ github.event.repository.name }} # until we can use action/checkout@v4
9594
env:
96-
SWIFT_VERSION: ${{ matrix.swift.swift_version }}
9795
COMMAND: ${{ inputs.matrix_linux_command }}
9896
EXAMPLE: ${{ matrix.examples }}
9997
run: |

‎.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
license_header_check_project_name: "SwiftAWSLambdaRuntime"
1313
shell_check_enabled: true
1414
python_lint_check_enabled: true
15-
api_breakage_check_container_image: "swift:6.0-noble"
15+
api_breakage_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
1616
docs_check_container_image: "swift:6.0-noble"
17-
format_check_container_image: "swiftlang/swift:nightly-6.0-jammy"
17+
format_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
1818
yamllint_check_enabled: true
1919

2020
unit-tests:
@@ -36,7 +36,7 @@ jobs:
3636
# We pass the list of examples here, but we can't pass an array as argument
3737
# Instead, we pass a String with a valid JSON array.
3838
# The workaround is mentioned here https://github.com/orgs/community/discussions/11692
39-
examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'ResourcesPackaging', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'Testing', 'Tutorial' ]"
39+
examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'ResourcesPackaging', 'S3EventNotifier', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'Testing', 'Tutorial' ]"
4040
archive_plugin_examples: "[ 'HelloWorld', 'ResourcesPackaging' ]"
4141
archive_plugin_enabled: true
4242

0 commit comments

Comments
 (0)
Please sign in to comment.