fix ci (#196)

Author: mxcl

.github/workflows/ci.yml

@@ -12,39 +12,43 @@ jobs:
     strategy:
       matrix:
         cfg:
-        - swift: 5.1
-          macos: macos-10.15
-        - swift: 5.2
-          macos: macos-10.15
-        - swift: 5.3
-          macos: macos-10.15
-        - swift: 5.4
-          macos: macos-11
         - swift: 5.5
-          macos: macos-11
+          macos: macos-12
         - swift: 5.6
           macos: macos-12
         - swift: 5.7
           macos: macos-12
+        - swift: ~5.8
+          macos: macos-14
+        - swift: ~5.9
+          macos: macos-14
+        - swift: ~5.10
+          macos: macos-14
+      # - swift: ~6.0
+      #   macos: macos-14
     steps:
-    - uses: actions/checkout@v2
-    - uses: mxcl/xcodebuild@v1
+    - uses: actions/checkout@v4
+    - uses: mxcl/xcodebuild@v3
       with:
         swift: ${{ matrix.cfg.swift }}
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         swift:
-          - 5.1
-          - 5.2
-          - 5.3
-          - 5.4
-          - 5.5
-          - 5.6
-          - 5.7
-    container:
-      image: swift:${{ matrix.swift }}
+        # - 5.1.5  # requires ubuntu 18.04
+          - 5.2.5
+          - 5.3.3
+          - 5.4.3
+          - 5.5.3
+          - 5.6.3
+          - 5.7.3
+          - 5.8.1
+          - 5.9.2
+          - 5.10.1
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - uses: YOCKOW/Action-setup-swift@v1
+      with:
+        swift-version: ${{ matrix.swift }}
     - run: swift test -Xswiftc -suppress-warnings --enable-test-discovery

Tests/All/ImportSpecificationUnitTests.swift

@@ -146,7 +146,7 @@ class ImportSpecificationUnitTests: XCTestCase {
         XCTAssertEqual(b?.importName, "Bar")
         XCTAssertEqual(b?.packageLine, ".package(path: \"\(tmpPath.string)\")")
     }
-    
+
     func testCanProvideLocalPathWithSpacesAndRelativeParentsUpTwo() throws {
         let tmpPath = Path.root.tmp.fake.fakechild1.fakechild2/"../.."/"with space"/"last"
         try tmpPath.mkdir(.p)
@@ -178,7 +178,7 @@ class ImportSpecificationUnitTests: XCTestCase {
         XCTAssertEqual(b?.importName, "Bar")
         XCTAssertEqual(b?.dependencyName.urlString, url)
     }
-    
+
     func testCanProvideCommonSSHURLStyle() throws {
         let uri = "[email protected]:MariusCiocanel/Path.swift.git"
         let b = try parse("import Path  // \(uri) ~> 1.0", from: .path(Path.cwd.join("script.swift")))
@@ -187,7 +187,7 @@ class ImportSpecificationUnitTests: XCTestCase {
         XCTAssertEqual(b?.importName, "Path")
         XCTAssertEqual(b?.dependencyName.urlString, "[email protected]:MariusCiocanel/Path.swift.git")
     }
-    
+
     func testCanProvideCommonSSHURLStyleWithHyphen() throws {
         let uri = "[email protected]:MariusCiocanel/swift-sh.git"
         let b = try parse("import Bar  // \(uri) ~> 1.0", from: .path(Path.cwd.join("script.swift")))
@@ -234,6 +234,8 @@ class ImportSpecificationUnitTests: XCTestCase {
     #if swift(>=5) || compiler(>=5.0)
     #if compiler(>=6.0)
         let expected = "6.0"
+    #elseif compiler(>=5.10)
+        let expected = "5.10"
     #elseif compiler(>=5.9)
         let expected = "5.9"
     #elseif compiler(>=5.8)

Tests/All/IntegrationTests.swift

@@ -512,6 +512,8 @@ class TestingTheTests: XCTestCase {
         XCTAssertEqual(expected, exec: """
             #if swift(>=6.0)
                 print(6.0)
+            #elseif swift(>=5.10)
+                print("5.10")
             #elseif swift(>=5.9)
                 print(5.9)
             #elseif swift(>=5.8)