Use Swift 5.3

Author: stevapple

.github/workflows/CI.yml

@@ -10,6 +10,7 @@ jobs:
       matrix:
         version:
           - 5.2.5
+          - 5.3
           - nightly-5.3
           - nightly
     container:
@@ -40,6 +41,7 @@ jobs:
           - centos8
         version:
           - 5.2.5
+          - 5.3
     container:
       image: swift:${{ matrix.version }}-${{ matrix.os }}
     steps:

docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG swift_version=5.2.5
+ARG swift_version=5.3
 FROM stevapple/swift-scf:$swift_version
 # needed to do again after FROM due to docker limitation
 ARG swift_version
@@ -15,7 +15,7 @@ RUN wget -q https://raw.githubusercontent.com/apple/swift/main/utils/symbolicate
 RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
 
 # swiftformat (until part of the toolchain)
-ARG swiftformat_version=0.45.6
+ARG swiftformat_version=0.46.3
 RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
 RUN cd $HOME/.tools/swift-format && swift build -c release
 RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/Dockerfile.ubuntu

@@ -1,4 +1,4 @@
-ARG swift_version=5.2.5
+ARG swift_version=5.3
 ARG ubuntu_version=bionic
 ARG base_image=swift:$swift_version-$ubuntu_version
 FROM $base_image
@@ -28,7 +28,7 @@ RUN wget -q https://raw.githubusercontent.com/apple/swift/main/utils/symbolicate
 RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
 
 # swiftformat (until part of the toolchain)
-ARG swiftformat_version=0.45.6
+ARG swiftformat_version=0.46.3
 RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
 RUN cd $HOME/.tools/swift-format && swift build -c release
 RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.bionic.52.yaml

@@ -3,18 +3,18 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-tencent-scf:scf-5.2.5
     build:
       dockerfile: Dockerfile.ubuntu
       args:
         ubuntu_version: "bionic"
-        swift_version: "5.2"
+        swift_version: "5.2.5"
 
   test:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-tencent-scf:scf-5.2.5
 
   test-samples:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-tencent-scf:scf-5.2.5
 
   shell:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-tencent-scf:scf-5.2.5

docker/docker-compose.bionic.53.yaml

@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-tencent-scf:scf-5.3
+    build:
+      dockerfile: Dockerfile.ubuntu
+      args:
+        ubuntu_version: "bionic"
+        swift_version: "5.3"
+
+  test:
+    image: swift-tencent-scf:scf-5.3
+
+  test-samples:
+    image: swift-tencent-scf:scf-5.3
+
+  shell:
+    image: swift-tencent-scf:scf-5.3

docker/docker-compose.scf.52.yaml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-tencent-scf:scf-5.2.5
+    build:
+      args:
+        swift_version: "5.2.5"
+
+  test:
+    image: swift-tencent-scf:scf-5.2.5
+
+  test-samples:
+    image: swift-tencent-scf:scf-5.2.5
+
+  shell:
+    image: swift-tencent-scf:scf-5.2.5

docker/docker-compose.scf.53.yaml

@@ -6,7 +6,7 @@ services:
     image: swift-tencent-scf:scf-5.3
     build:
       args:
-        swift_version: "nightly-5.3"
+        swift_version: "5.3"
 
   test:
     image: swift-tencent-scf:scf-5.3

docker/docker-compose.yaml

@@ -1,6 +1,6 @@
 # this file is not designed to be run directly
 # instead, use the docker-compose.<os>.<swift> files
-# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.1804.52.yaml run test
+# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.scf.53.yaml run test
 version: "3"
 
 services: