Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit b0cca9e

Browse files
Andrea-ScuderiAndrea-Scuderi
authored
Merge pull request #36 from Andrea-Scuderi/feature/swift_5_1_4
Update to swift 5.1.4
2 parents e684cc7 + d5a04f2 commit b0cca9e

File tree

14 files changed

+19
-19
lines changed

14 files changed

+19
-19
lines changed

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ deploy:
6565
provider: releases
6666
api_key:
6767
secure: Ddgpz/LsTWeTTr8Xm0br+Vs3Is58V2bOHthwLOt5a1TbyhWAgU+tyc6lwvd51mhQxeNNVPSOWLKC4QgJEp2KI2ZCaw0K+Czb8lqMzWF5eJggDmJ0+wOZIHVEWMO7smLTwDc1jWtdnQA3qkPtXgSw0ERcJ9z4/haz1Q8v7Jj5qfoBJiNxnYYvw/79ElqROIjtQ0asX/i6xhZSlBFO1dXo5QPzX7XeNREQmh2dCkjfoeYSFSCah4Tnn5akxX36Pef1DJvWdFvc623pWAUoCpeswIMW/htby5tJQ6+C9PK+2yzqomKfU9gTK9iv7Nt3X1LN3KsXpk6VHgtljiUkEsecXjYB5WVBT00mY/4bnTPyY6RjI/V6C0aGnTE+0Pj78kDofJKj5uNevFi4vlBI2g4s4G0mRASFRp+sk3ASmzl62Lohkl1LfNiPYKRKRA2jT81s79zBnYv/MQ7t3fY+yd7iP+NrJfDFR/XG0vxBOQrNRpq6LR0M7DeHgTD/d9an2WEqJlX9pp+Ji/ywwepW7b/NLv42xeN99SnHbDmJJ/eZ4P1IC37JCOT5CjJ9wIyP8c+Q89JT30nlvON9xPM8MOx/MrVAGCeqC6FW1Zjc6oakTRZdngMqN1acH5OosLX83cOjjXo8ivRt5Sm2tfX3ZuOgL98kdaYsIBPIYbYhZDODdvM=
68-
file: ".build/layer/swift-lambda-runtime-5-1-3.zip"
68+
file: ".build/layer/swift-lambda-runtime-5-1-4.zip"
6969
skip_cleanup: true
7070
on:
7171
tags: true

Diff for: ‎Examples/HTTPSRequest/.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nio-swift:5.1.3
1+
FROM nio-swift:5.1.4
22

33
# Or your actual UID, GID on Linux if not the default 1000
44
ARG USERNAME=vscode

Diff for: ‎Examples/HTTPSRequest/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# HTTPSRequest
22

3-
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.3](https://img.shields.io/badge/Swift-5.1.3-blue.svg)](https://swift.org/download/)
3+
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.4](https://img.shields.io/badge/Swift-5.1.4-blue.svg)](https://swift.org/download/)
44

55
This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework and the plugin [LambdaSwiftSprinterNioPlugin](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) to build a lambda capable to perform an HTTPS request.
66

Diff for: ‎Examples/HelloWorld/.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nio-swift:5.1.3
1+
FROM nio-swift:5.1.4
22

33
# Or your actual UID, GID on Linux if not the default 1000
44
ARG USERNAME=vscode

Diff for: ‎Examples/HelloWorld/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# HelloWorld
22

3-
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.3](https://img.shields.io/badge/Swift-5.1.3-blue.svg)](https://swift.org/download/)
3+
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.4](https://img.shields.io/badge/Swift-5.1.4-blue.svg)](https://swift.org/download/)
44

55
This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework to build a simple lambda.
66

Diff for: ‎Examples/PostgreSQLDemo/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PostgreSQLDemo
22

3-
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.3](https://img.shields.io/badge/Swift-5.1.3-blue.svg)](https://swift.org/download/)
3+
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.4](https://img.shields.io/badge/Swift-5.1.4-blue.svg)](https://swift.org/download/)
44

55
This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework and the plugin [LambdaSwiftSprinterNioPlugin](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) to build a lambda capable to perform an Postgres query using
66
[PostgresNIO](https://github.com/vapor/postgres-nio.git).

Diff for: ‎Examples/RedisDemo/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RedisDemo
22

3-
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.3](https://img.shields.io/badge/Swift-5.1.3-blue.svg)](https://swift.org/download/)
3+
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.4](https://img.shields.io/badge/Swift-5.1.4-blue.svg)](https://swift.org/download/)
44

55
This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework and the plugin [LambdaSwiftSprinterNioPlugin](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) to build a lambda capable to perform an Redis request using
66
[RediStack](https://gitlab.com/mordil/swift-redi-stack.git).

Diff for: ‎Examples/S3Test/.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nio-swift:5.1.3
1+
FROM nio-swift:5.1.4
22

33
# Or your actual UID, GID on Linux if not the default 1000
44
ARG USERNAME=vscode

Diff for: ‎Examples/S3Test/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
SWIFT_PROJECT_PATH=Examples/S3Test
33

44
start_docker_compose_env:
5-
cd $(SWIFT_PROJECT_PATH); docker-compose up -d ; sleep 5
6-
aws --endpoint http://localhost:4572 s3 mb s3://my-s3-bucket
5+
cd $(SWIFT_PROJECT_PATH); docker-compose up -d ; sleep 10
6+
aws --endpoint http://localhost:4572 --cli-connect-timeout 5 s3 mb s3://my-s3-bucket
77
aws --endpoint http://localhost:4572 s3 cp $(SWIFT_PROJECT_PATH)/hello.txt s3://my-s3-bucket/hello.txt
88

99
stop_docker_compose_env:

Diff for: ‎Examples/S3Test/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# S3Test
22

3-
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.3](https://img.shields.io/badge/Swift-5.1.3-blue.svg)](https://swift.org/download/)
3+
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.4](https://img.shields.io/badge/Swift-5.1.4-blue.svg)](https://swift.org/download/)
44

55
This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework with the third-party library [https://github.com/swift-aws/aws-sdk-swift.git](https://github.com/swift-aws/aws-sdk-swift.git) to build a lambda capable to perform an HTTPS request to an S3 Bucket.
66

Diff for: ‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
# Use this tag to build a customized local image
33

4-
SWIFT_VERSION?=5.1.3
5-
LAYER_VERSION?=5-1-3
4+
SWIFT_VERSION?=5.1.4
5+
LAYER_VERSION?=5-1-4
66
# SWIFT_VERSION=5.0.3
77
# LAYER_VERSION=5-0-3
88
DOCKER_TAG=nio-swift:$(SWIFT_VERSION)

Diff for: ‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# aws-lambda-swift-sprinter
22

3-
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.3](https://img.shields.io/badge/Swift-5.1.3-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0--alpha.3-red) ![](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter.svg?branch=master) ![](https://img.shields.io/badge/@AWS-Open-orange.svg)
3+
[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.4](https://img.shields.io/badge/Swift-5.1.4-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0--alpha.3-red) ![](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter.svg?branch=master) ![](https://img.shields.io/badge/@AWS-Open-orange.svg)
44

55
![](./images/aws-lambda-swift-sprinter.png)
66

@@ -175,8 +175,8 @@ make invoke_lambda \
175175
| AWS_PROFILE | An AWS AIM profile you create to authenticate to your account. | default |
176176
| IAM_ROLE_NAME | The execution role created that will be assumed by the Lambda. | lambda_sprinter_basic_execution |
177177
| AWS_BUCKET | The AWS S3 bucket where the layer and lambdas zip files get uploaded. | aws-lambda-swift-sprinter |
178-
| SWIFT_VERSION | Version of Swift used / Matches Dockerfile location too from `docker/` folder. | 5.1.3 |
179-
| LAYER_VERSION | Version of the Swift layer that will be created and uploaded for the Lambda to run on. | 5-1-3 |
178+
| SWIFT_VERSION | Version of Swift used / Matches Dockerfile location too from `docker/` folder. | 5.1.4 |
179+
| LAYER_VERSION | Version of the Swift layer that will be created and uploaded for the Lambda to run on. | 5-1-4 |
180180
| SWIFT_EXECUTABLE | Name of the binary file. | HelloWorld |
181181
| SWIFT_PROJECT_PATH | Path to your Swift project. | Examples/HelloWorld |
182182
| LAMBDA_FUNCTION_NAME | Display name of your Lambda in AWS. | HelloWorld |
@@ -459,8 +459,8 @@ Stop the docker-compose test environment
459459

460460
### Configure:
461461
- Go to `AWS Lambda -> Layers` in AWS Console and create a new layer from scratch
462-
- Enter layer name "swift-lambda-runtime-5-1-3"
463-
- Upload the zip file `build/swift-lambda-runtime-5-1-3.zip`
462+
- Enter layer name "swift-lambda-runtime-5-1-4"
463+
- Upload the zip file `build/swift-lambda-runtime-5-1-4.zip`
464464
- Leave "Compatible runtimes" empty.
465465
- Click "Create"
466466
- Copy the `arn` from the created layer, it's required to set up the lambda.

Diff for: ‎docker/5.1.3/Dockerfile renamed to ‎docker/5.1.4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:5.1.3 as builder
1+
FROM swift:5.1.4 as builder
22

33
RUN apt-get -qq update && apt-get -q -y install \
44
libssl-dev libicu-dev

Diff for: ‎docker/5.1.3/swift-shared-libraries.txt renamed to ‎docker/5.1.4/swift-shared-libraries.txt

File renamed without changes.

0 commit comments

Comments
 (0)