Merge pull request #41 from amzn/ci_for_5_8

Add CI for 5.8, drop 5.5.
amzn · Apr 17, 2023 · 17a6440 · 17a6440
2 parents d007bdf + 85aae86
commit 17a6440
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 134 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -8,14 +8,28 @@ on:
 
 jobs:
   Build:
+    name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-22.04]
+        swift: ["5.8", "5.7.3"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: swift-actions/[email protected]
+        with:
+          swift-version: ${{ matrix.swift }}
+      - uses: actions/checkout@v2
+      - name: Build
+        run: swift build -c release
+  OlderVersionBuild:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        swift: ["5.7", "5.6.3", "5.5.3"]
+        swift: ["5.6.3"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: swift-actions/setup-swift@v1.18.0
+      - uses: swift-actions/setup-swift@v1.23.0
         with:
           swift-version: ${{ matrix.swift }}
       - uses: actions/checkout@v2

diff --git a/Package.resolved b/Package.resolved
@@ -1,70 +1,68 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "OpenAPISwiftCodeGenerate",
-        "repositoryURL": "https://github.com/amzn/openapi-swift-code-generate.git",
-        "state": {
-          "branch": null,
-          "revision": "4210a8db0c2dc1e78bae9e302165c448d2ee361e",
-          "version": "1.0.0-rc.1"
-        }
-      },
-      {
-        "package": "OpenAPIKit",
-        "repositoryURL": "https://github.com/mattpolzin/OpenAPIKit.git",
-        "state": {
-          "branch": null,
-          "revision": "15e39d1594b5da2b11d63f141203296d48cc5213",
-          "version": "3.0.0-alpha.5"
-        }
-      },
-      {
-        "package": "ServiceModelSwiftCodeGenerate",
-        "repositoryURL": "https://github.com/amzn/service-model-swift-code-generate.git",
-        "state": {
-          "branch": null,
-          "revision": "3cacd62f7290554185ffcf839ec75c4ee2584d8e",
-          "version": "3.0.0-rc.2"
-        }
-      },
-      {
-        "package": "SmokeAWSGenerate",
-        "repositoryURL": "https://github.com/amzn/smoke-aws-generate.git",
-        "state": {
-          "branch": null,
-          "revision": "c091b7e08be0ba5c1f8c08c3a145796c6b800f36",
-          "version": "3.0.0-rc.6"
-        }
-      },
-      {
-        "package": "SwaggerParser",
-        "repositoryURL": "https://github.com/tachyonics/SwaggerParser.git",
-        "state": {
-          "branch": null,
-          "revision": "c0eb70485c59a9d7dd6765dcd303b49fdb3040ee",
-          "version": "0.6.4"
-        }
-      },
-      {
-        "package": "swift-argument-parser",
-        "repositoryURL": "https://github.com/apple/swift-argument-parser",
-        "state": {
-          "branch": null,
-          "revision": "9f39744e025c7d377987f30b03770805dcb0bcd1",
-          "version": "1.1.4"
-        }
-      },
-      {
-        "package": "Yams",
-        "repositoryURL": "https://github.com/jpsim/Yams.git",
-        "state": {
-          "branch": null,
-          "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
-          "version": "4.0.6"
-        }
+  "pins" : [
+    {
+      "identity" : "openapi-swift-code-generate",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/amzn/openapi-swift-code-generate.git",
+      "state" : {
+        "revision" : "9ac750f50061f9046d6dbdf71fe064234f4ed099",
+        "version" : "1.0.1"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "openapikit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattpolzin/OpenAPIKit.git",
+      "state" : {
+        "revision" : "d40e6c3d57b1b27ac2114861d5a83cf8ee9d206d",
+        "version" : "3.0.0-alpha.6"
+      }
+    },
+    {
+      "identity" : "service-model-swift-code-generate",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/amzn/service-model-swift-code-generate.git",
+      "state" : {
+        "revision" : "b9d45b4d05196c26247d4bd3aca83c1e53eed72c",
+        "version" : "3.0.2"
+      }
+    },
+    {
+      "identity" : "smoke-aws-generate",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/amzn/smoke-aws-generate.git",
+      "state" : {
+        "revision" : "8f0eae3b4afd9f5e586d6fcf6c9f1c171923a83d",
+        "version" : "3.0.0"
+      }
+    },
+    {
+      "identity" : "swaggerparser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tachyonics/SwaggerParser.git",
+      "state" : {
+        "revision" : "c0eb70485c59a9d7dd6765dcd303b49fdb3040ee",
+        "version" : "0.6.4"
+      }
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser",
+      "state" : {
+        "revision" : "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
+        "version" : "1.2.2"
+      }
+    },
+    {
+      "identity" : "yams",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jpsim/Yams.git",
+      "state" : {
+        "revision" : "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
+        "version" : "4.0.6"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Package.swift b/Package.swift
@@ -38,9 +38,9 @@ let package = Package(
             targets: ["SmokeFrameworkGenerateHttp1"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/amzn/smoke-aws-generate.git", from: "3.0.0-rc.6"),
-        .package(url: "https://github.com/amzn/service-model-swift-code-generate.git", from: "3.0.0-rc.2"),
-        .package(url: "https://github.com/amzn/openapi-swift-code-generate.git", from: "1.0.0-rc.1"),
+        .package(url: "https://github.com/amzn/smoke-aws-generate.git", from: "3.0.0"),
+        .package(url: "https://github.com/amzn/service-model-swift-code-generate.git", from: "3.0.0"),
+        .package(url: "https://github.com/amzn/openapi-swift-code-generate.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
     ],
     targets: [

diff --git a/[email protected] b/[email protected]
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <img src="https://github.com/amzn/smoke-framework-application-generate/actions/workflows/swift.yml/badge.svg?branch=main" alt="Build - main Branch">
 </a>
 <a href="http://swift.org">
-<img src="https://img.shields.io/badge/swift-5.5|5.6|5.7-orange.svg?style=flat" alt="Swift 5.5, 5.6 and 5.7 Tested">
+<img src="https://img.shields.io/badge/swift-5.6|5.7|5.8-orange.svg?style=flat" alt="Swift 5.6, 5.7 and 5.8 Tested">
 </a>
 <a href="https://gitter.im/SmokeServerSide">
 <img src="https://img.shields.io/badge/chat-on%20gitter-ee115e.svg?style=flat" alt="Join the Smoke Server Side community on gitter">