Skip to content

Commit 63702a5

Browse files
sebstosebsto
committed
Merge branch 'main' into sebsto/new-plugins
2 parents e3a579c + a1ab8df commit 63702a5

File tree

86 files changed

+2282
-888
lines changed

Some content is hidden

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

86 files changed

+2282
-888
lines changed

‎.github/workflows/integration_tests.yml‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ 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 6.1 Amazon Linux 2 image."
42-
default: "swiftlang/swift:nightly-6.1-amazonlinux2"
41+
# Note: we don't use Amazon Linux 2 here because zip is not installed by default.
42+
description: "Container image for the matrix test jobs. Defaults to Swift 6.2 on Amazon Linux 2."
43+
default: "swift:6.2-amazonlinux2"
4344

4445
## We are cancelling previously triggered workflow runs
4546
concurrency:
@@ -48,7 +49,7 @@ concurrency:
4849

4950
jobs:
5051
test-examples:
51-
name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.swift_version }}
52+
name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.image }}
5253
if: ${{ inputs.examples_enabled }}
5354
runs-on: ubuntu-latest
5455
strategy:
@@ -105,14 +106,17 @@ jobs:
105106
fail-fast: false
106107
matrix:
107108
examples: ${{ fromJson(inputs.archive_plugin_examples) }}
109+
# These must run on Ubuntu and not in a container, because the plugin uses docker
108110
steps:
109111
- name: Checkout repository
110112
uses: actions/checkout@v4
111113
with:
112114
persist-credentials: false
115+
113116
- name: Mark the workspace as safe
114117
# https://github.com/actions/checkout/issues/766
115118
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
119+
116120
- name: Test the archive plugin
117121
env:
118122
EXAMPLE: ${{ matrix.examples }}
@@ -123,14 +127,37 @@ jobs:
123127
name: No dependencies on Foundation
124128
if: ${{ inputs.check_foundation_enabled }}
125129
runs-on: ubuntu-latest
130+
container:
131+
image: ${{ inputs.matrix_linux_swift_container_image }}
126132
steps:
127-
- name: Checkout repository
128-
uses: actions/checkout@v4
129-
with:
130-
persist-credentials: false
133+
# GitHub checkout action has a dep on NodeJS 20 which is not running on Amazonlinux2
134+
# workaround is to manually checkout the repository
135+
# https://github.com/actions/checkout/issues/1487
136+
- name: Manually Clone repository and checkout PR
137+
env:
138+
PR_NUMBER: ${{ github.event.pull_request.number }}
139+
run: |
140+
# Clone the repository
141+
git clone https://github.com/${{ github.repository }}
142+
cd ${{ github.event.repository.name }}
143+
144+
# Fetch the pull request
145+
git fetch origin +refs/pull/$PR_NUMBER/merge:
146+
147+
# Checkout the pull request
148+
git checkout -qf FETCH_HEAD
149+
150+
# - name: Checkout repository
151+
# uses: actions/checkout@v4
152+
# with:
153+
# persist-credentials: false
154+
131155
- name: Mark the workspace as safe
156+
working-directory: ${{ github.event.repository.name }} # until we can use action/checkout@v4
132157
# https://github.com/actions/checkout/issues/766
133158
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
159+
134160
- name: Check for Foundation or ICU dependency
161+
working-directory: ${{ github.event.repository.name }} # until we can use action/checkout@v4
135162
run: |
136163
.github/workflows/scripts/check-link-foundation.sh

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 4 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: "swiftlang/swift:nightly-6.1-jammy"
16-
docs_check_container_image: "swift:6.0-noble"
17-
format_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
15+
api_breakage_check_container_image: "swift:6.2-noble"
16+
docs_check_container_image: "swift:6.2-noble"
17+
format_check_container_image: "swift:6.2-noble"
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', 'S3EventNotifier', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'StreamingFromEvent', 'ServiceLifecycle+Postgres', 'Testing', 'Tutorial' ]"
39+
examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'HelloWorldNoTraits', 'HummingbirdLambda', 'ResourcesPackaging', 'S3EventNotifier', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'Streaming+Codable', 'ServiceLifecycle+Postgres', 'Testing', 'Tutorial' ]"
4040
archive_plugin_examples: "[ 'HelloWorld', 'ResourcesPackaging' ]"
4141
archive_plugin_enabled: true
4242

‎.mailmap‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ Tomer Doron <tomer@apple.com> <tomer@apple.com>
22
Tomer Doron <tomer@apple.com> <tomerd@apple.com>
33
Tomer Doron <tomer@apple.com> <tomer.doron@gmail.com>
44
Fabian Fett <fabianfett@apple.com> <fabianfett@apple.com>
5-
Fabian Fett <fabianfett@apple.com> <fabianfett@mac.com>
5+
Fabian Fett <fabianfett@apple.com> <fabianfett@mac.com>
6+
Sébastien Stormacq <stormacq@amazon.com> <sebastien.stormacq@gmail.com>

‎CONTRIBUTORS.txt‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,66 @@ needs to be listed here.
88
## COPYRIGHT HOLDERS
99

1010
- Apple Inc. (all contributors with '@apple.com')
11+
- Amazon.com, Inc. or its affiliates (all contributors with '@amazon.com')
1112

1213
### Contributors
1314

1415
- Adam Fowler <adamfowler71@gmail.com>
16+
- Adolfo <fitomad@users.noreply.github.com>
17+
- Alessio Buratti <9006089+Buratti@users.noreply.github.com>
1518
- Andrea Scuderi <andreascuderi@ymail.com>
19+
- Bill <3207996+gestrich@users.noreply.github.com>
1620
- Brendan Kirchner <brendankirchner@me.com>
1721
- Bryan Bartow <bryanbartow@gmail.com>
1822
- Bryan Moffatt <bmoffatt@users.noreply.github.com>
23+
- Camden Fullmer <camdenfullmer@gmail.com>
1924
- Christoph Walcher <christoph-wa@gmx.de>
2025
- Colton Schlosser <cltnschlosser@gmail.com>
26+
- Cory Benfield <lukasa@apple.com>
27+
- Dmitry Platonov <dsplatonov@mail.ru>
28+
- DwayneCoussement <dwayne.coussement@gmail.com>
29+
- DwayneCoussement <dwayne.coussement@showpad.com>
2130
- Eneko Alonso <eneko.alonso@gmail.com>
22-
- Fabian Fett <fabianfett@mac.com>
31+
- Fabian Fett <fabianfett@apple.com>
32+
- Filipp Fediakov <julik103@mail.ru>
33+
- Florent Morin <florentmorin@icloud.com>
34+
- Franz Busch <f.busch@apple.com>
35+
- Franz Busch <privat@franz-busch.de>
2336
- George Barnett <gbarnett@apple.com>
37+
- Jack Rosen <jrosen081@gmail.com>
38+
- Joannis Orlandos <joannis@orlandos.nl>
39+
- Joel Saltzman <talk@joelsaltzman.com>
40+
- Johannes Bosecker <j.bosecker.dev@icloud.com>
2441
- Johannes Weiss <johannesweiss@apple.com>
42+
- Josh <29730338+mr-j-tree@users.noreply.github.com>
43+
- Juan A. Reyes <59104004+jareyesda@users.noreply.github.com>
44+
- Konrad `ktoso` Malawski <konrad.malawski@project13.pl>
45+
- ML <44809298+mufumade@users.noreply.github.com>
46+
- Marwane Koutar <100198937+MarwaneKoutar@users.noreply.github.com>
47+
- Matt Massicotte <85322+mattmassicotte@users.noreply.github.com>
2548
- Max Desiatov <max@desiatov.com>
49+
- Natan Rolnik <me@natanrolnik.me>
2650
- Norman Maurer <norman_maurer@apple.com>
51+
- Paul Toffoloni <69189821+ptoffy@users.noreply.github.com>
52+
- Ralph Küpper <ralph.kuepper@skelpo.com>
2753
- Ro-M <Ro-M@users.noreply.github.com>
54+
- Stefan Nienhuis <stefan@nienhuisdevelopment.com>
55+
- Sven A. Schmidt <sas@finestructure.co>
56+
- Sébastien Stormacq <stormacq@amazon.com>
57+
- Tim Condon <0xTim@users.noreply.github.com>
58+
- Tobias <t089@users.noreply.github.com>
2859
- Tomer Doron <tomer@apple.com>
60+
- YR Chen <stevapple@icloud.com>
61+
- Yim Lee <yim_lee@apple.com>
2962
- Zhibin Cai <TonyChol@users.noreply.github.com>
63+
- aryan-25 <aryan_shah@apple.com>
64+
- dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
65+
- jsonfry <jason@jasonfry.co.uk>
66+
- mattcorey <mattcorey@users.noreply.github.com>
3067
- pmarrufo <p_marrufo94@hotmail.com>
68+
- pokryfka <5090827+pokryfka@users.noreply.github.com>
69+
- pokryfka <pokryfka@gmail.com>
70+
- sja26 <sja26@users.noreply.github.com>
3171
- tachyonics <simon@tachyonics.io>
3272

3373
**Updating this list**

‎Examples/APIGateway+LambdaAuthorizer/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.2
22

33
import PackageDescription
44

@@ -14,7 +14,7 @@ let package = Package(
1414
],
1515
dependencies: [
1616
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
17-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
17+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
1818
.package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
1919
],
2020
targets: [

‎Examples/APIGateway/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.2
22

33
import PackageDescription
44

@@ -13,7 +13,7 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
16+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
1717
.package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
1818
],
1919
targets: [

‎Examples/BackgroundTasks/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.2
22

33
import PackageDescription
44

@@ -13,7 +13,7 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1")
16+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
1717
],
1818
targets: [
1919
.executableTarget(

‎Examples/CDK/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.2
22

33
import PackageDescription
44

@@ -13,7 +13,7 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
16+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
1717
.package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
1818
],
1919
targets: [

‎Examples/HelloJSON/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.1
1+
// swift-tools-version:6.2
22

33
import PackageDescription
44

@@ -15,7 +15,7 @@ let package = Package(
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
1616
.package(
1717
url: "https://github.com/swift-server/swift-aws-lambda-runtime.git",
18-
from: "2.0.0-beta.1"
18+
from: "2.0.0"
1919
)
2020
],
2121
targets: [

‎Examples/HelloWorld/Package.swift‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.1
2+
// This example has to be in Swift 6.1 because it is used in the test archive plugin CI job
3+
// That job runs on GitHub's ubuntu-latest environment that only supports Swift 6.1
4+
// https://github.com/actions/runner-images?tab=readme-ov-file
5+
// https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
6+
// We can update to Swift 6.2 when GitHUb hosts will have Swift 6.2
27

38
import PackageDescription
49

@@ -13,7 +18,7 @@ let package = Package(
1318
],
1419
dependencies: [
1520
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1")
21+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
1722
],
1823
targets: [
1924
.executableTarget(

0 commit comments

Comments
 (0)