Fix GitHub actions (#9)

Co-authored-by: Full Queue Developer <fullqueuedeveloper@fullqueuedeveloper.com>
DanielSincere · Oct 5, 2023 · e7b183c · e7b183c
1 parent eab73d7
commit e7b183c
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 62 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,13 +15,17 @@ jobs:
         include:
           - os: macos-13
             swift: "5.8"
+          - os: macos-13
+            swift: "5.9"
           - os: ubuntu-latest
             swift: "5.8"
+          - os: ubuntu-latest
+            swift: "5.9"
 
     steps:
-      - uses: slashmo/install-swift@v0.4.0
+      - uses: swift-actions/setup-swift@v1
         with:
-          version: ${{ matrix.swift }}
+          swift-version: ${{ matrix.swift }}
 
       - uses: actions/checkout@v3
 

diff --git a/Sources/SPXLib/templates-generated/-.iosFiles.swift b/Sources/SPXLib/templates-generated/-.iosFiles.swift
@@ -175,7 +175,7 @@ ScaffoldFile(directory: "SPX",
 ScaffoldFile(directory: "SPX",
              name: "Package.swift",
              contents: #"""
-// swift-tools-version: 5.7
+// swift-tools-version: 5.8
 
 import PackageDescription
 
@@ -308,7 +308,7 @@ struct BuildNumberAction {
     }
 
     init(gitTag: String) throws {
-      
+
       guard let tagPrefixRange = gitTag.range(of: tagPrefix) else {
         throw Errors.gitTagDoesntHavePrefix
       }

diff --git a/Sources/SPXLib/templates-generated/-.simpleFiles.swift b/Sources/SPXLib/templates-generated/-.simpleFiles.swift
@@ -46,10 +46,10 @@ import PackageDescription
 let package = Package(
   name: "SPXScripts",
   platforms: [
-    .macOS(.v12),
+    .macOS(.v13),
   ],
   dependencies: [
-    .package(url: "https://github.com/FullQueueDeveloper/Sh.git", from: "1.2.0"),
+    .package(url: "https://github.com/FullQueueDeveloper/Sh.git", from: "1.3.0"),
   ],
   targets: [
     .executableTarget(

diff --git a/demos/VaporDemo/Dockerfile b/demos/VaporDemo/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/x86-64 index.docker.io/library/swift:5.7-focal as builder
+FROM --platform=linux/x86-64 index.docker.io/library/swift:5.8-focal as builder
 WORKDIR /src
 COPY ./Package.* ./
 COPY ./Sources ./Sources
@@ -7,7 +7,7 @@ RUN swift build -c release --arch x86_64 -Xswiftc -g
 RUN mkdir /output
 RUN cp $(swift build -c release --arch x86_64 -Xswiftc -g --show-bin-path)/Run /output/Run
 
-FROM index.docker.io/library/swift:5.7-focal-slim as prod_base
+FROM index.docker.io/library/swift:5.8-focal-slim as prod_base
 RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
 WORKDIR /app
 COPY --from=builder --chown=vapor:vapor /output/* /app

diff --git a/demos/VaporDemo/Package.resolved b/demos/VaporDemo/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swift-server/async-http-client.git",
       "state" : {
-        "revision" : "78db67e5bf4a8543075787f228e8920097319281",
-        "version" : "1.18.0"
+        "revision" : "16f7e62c08c6969899ce6cc277041e868364e5cf",
+        "version" : "1.19.0"
       }
     },
     {
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/console-kit.git",
       "state" : {
-        "revision" : "9a12000f4064a2bdc49068d7258292ec1bdc88fc",
-        "version" : "4.7.0"
+        "revision" : "d4b580e466c61f82a46d6bcc0b356add388f7ad2",
+        "version" : "4.8.1"
       }
     },
     {
@@ -59,35 +59,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-atomics.git",
       "state" : {
-        "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10",
-        "version" : "1.1.0"
-      }
-    },
-    {
-      "identity" : "swift-backtrace",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/swift-server/swift-backtrace.git",
-      "state" : {
-        "revision" : "f25620d5d05e2f1ba27154b40cafea2b67566956",
-        "version" : "1.3.3"
+        "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
+        "version" : "1.2.0"
       }
     },
     {
       "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2",
-        "version" : "1.0.4"
+        "revision" : "a902f1823a7ff3c9ab2fba0f992396b948eda307",
+        "version" : "1.0.5"
       }
     },
     {
       "identity" : "swift-crypto",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-crypto.git",
       "state" : {
-        "revision" : "60f13f60c4d093691934dc6cfdf5f508ada1f894",
-        "version" : "2.6.0"
+        "revision" : "629f0b679d0fd0a6ae823d7f750b9ab032c00b80",
+        "version" : "3.0.0"
       }
     },
     {
@@ -113,17 +104,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "cf281631ff10ec6111f2761052aa81896a83a007",
-        "version" : "2.58.0"
+        "revision" : "3db5c4aeee8100d2db6f1eaf3864afdad5dc68fd",
+        "version" : "2.59.0"
       }
     },
     {
       "identity" : "swift-nio-extras",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-extras.git",
       "state" : {
-        "revision" : "0e0d0aab665ff1a0659ce75ac003081f2b1c8997",
-        "version" : "1.19.0"
+        "revision" : "fb70a0f5e984f23be48b11b4f1909f3bee016178",
+        "version" : "1.19.1"
       }
     },
     {
@@ -167,8 +158,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/vapor.git",
       "state" : {
-        "revision" : "1bb4a2ed94bec7a92f92e82896408c785d068f5c",
-        "version" : "4.79.0"
+        "revision" : "036d67e4da46126810f56c6a6ce813bcf259a745",
+        "version" : "4.84.1"
       }
     },
     {

diff --git a/demos/VaporDemo/Package.swift b/demos/VaporDemo/Package.swift
@@ -7,7 +7,7 @@ let package = Package(
   platforms: [.macOS(.v13)],
 
   dependencies: [
-    .package(url: "https://github.com/vapor/vapor.git", from: "4.55.0"),
+    .package(url: "https://github.com/vapor/vapor.git", from: "4.84.0"),
   ],
   targets: [
     .executableTarget(name: "Run",

diff --git a/demos/VaporDemo/SPX/Package.resolved b/demos/VaporDemo/SPX/Package.resolved
@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Rainbow",
-        "repositoryURL": "https://github.com/onevcat/Rainbow",
-        "state": {
-          "branch": null,
-          "revision": "e0dada9cd44e3fa7ec3b867e49a8ddbf543e3df3",
-          "version": "4.0.1"
-        }
-      },
-      {
-        "package": "Sh",
-        "repositoryURL": "https://github.com/FullQueueDeveloper/Sh.git",
-        "state": {
-          "branch": null,
-          "revision": "a40bba19d8085761e051fa1f0d5937259fa2e17a",
-          "version": "1.2.0"
-        }
+  "pins" : [
+    {
+      "identity" : "rainbow",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Rainbow",
+      "state" : {
+        "revision" : "e0dada9cd44e3fa7ec3b867e49a8ddbf543e3df3",
+        "version" : "4.0.1"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "sh",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FullQueueDeveloper/Sh.git",
+      "state" : {
+        "revision" : "1c30064de9dceac00aa3fefc70a1431e425e5f28",
+        "version" : "1.3.0"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/demos/VaporDemo/SPX/Package.swift b/demos/VaporDemo/SPX/Package.swift
@@ -1,13 +1,13 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 
 import PackageDescription
 
 let package = Package(
     name: "SPXScripts",
-    platforms: [.macOS(.v12)],
+    platforms: [.macOS(.v13)],
     products: [ ],
     dependencies: [
-        .package(url: "https://github.com/FullQueueDeveloper/Sh.git", from: "1.2.0"),
+        .package(url: "https://github.com/FullQueueDeveloper/Sh.git", from: "1.3.0"),
     ],
     targets: [
         .executableTarget(

diff --git a/templates/ios/SPX/Package.swift b/templates/ios/SPX/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.8
 
 import PackageDescription
 

diff --git a/templates/simple/SPX/Package.swift b/templates/simple/SPX/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.8
 
 import PackageDescription
 
@@ -8,7 +8,7 @@ let package = Package(
     .macOS(.v12),
   ],
   dependencies: [
-    .package(url: "https://github.com/FullQueueDeveloper/Sh.git", from: "1.2.0"),
+    .package(url: "https://github.com/FullQueueDeveloper/Sh.git", from: "1.3.0"),
   ],
   targets: [
     .executableTarget(