Browse Source

Move Check to Swift 5.5.1 for SecTrustCopyCertificateChain (#3606)

* Move check to 5.5.1 for new Sec APIs.

* Test macOS using all Xcodes.
Jon Shier 3 years ago
parent
commit
6b72d947a1
2 changed files with 19 additions and 9 deletions
  1. 18 8
      .github/workflows/ci.yml
  2. 1 1
      Source/ServerTrustEvaluation.swift

+ 18 - 8
.github/workflows/ci.yml

@@ -22,7 +22,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   macOS:
-    name: Test macOS (5.6, 5.5, 5.4, 5.3)
+    name: Test macOS, All Xcodes and Swifts
     runs-on: ${{ matrix.runsOn }}
     defaults:
       run:
@@ -35,23 +35,33 @@ jobs:
       matrix:
         include:
           - xcode: "Xcode_13.3.1.app"
-            runsOn: firebreak
-            name: "macOS 12, Swift 5.6"
-            firewalk: "brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk &"
-            shell: "/usr/bin/arch -arch arm64e /bin/zsh {0}"
+            runsOn: macOS-12
+            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
+            firewalk: "brew install alamofire/alamofire/firewalk && firewalk &"
+            shell: "/bin/zsh {0}"
           - xcode: "Xcode_13.2.1.app"
             runsOn: macOS-11
-            name: "macOS 11, Swift 5.5"
+            name: "macOS 11, Xcode 13.2.1, Swift 5.5.2"
+            firewalk: "brew install alamofire/alamofire/firewalk && firewalk &"
+            shell: "/bin/zsh {0}"
+          - xcode: "Xcode_13.1.app"
+            runsOn: macOS-11
+            name: "macOS 11, Xcode 13.1, Swift 5.5.1"
+            firewalk: "brew install alamofire/alamofire/firewalk && firewalk &"
+            shell: "/bin/zsh {0}"
+          - xcode: "Xcode_13.0.app"
+            runsOn: macOS-11
+            name: "macOS 11, Xcode 13.0, Swift 5.5.0"
             firewalk: "brew install alamofire/alamofire/firewalk && firewalk &"
             shell: "/bin/zsh {0}"
           - xcode: "Xcode_12.5.1.app"
             runsOn: macOS-11
-            name: "macOS 11, Swift 5.4"
+            name: "macOS 11, Xcode 12.5.1, Swift 5.4"
             firewalk: "brew install alamofire/alamofire/firewalk && firewalk &"
             shell: "/bin/zsh {0}"
           - xcode: "Xcode_12.4.app"
             runsOn: macOS-10.15
-            name: "macOS 10.15, Swift 5.3"
+            name: "macOS 10.15, Xcode 12.4, Swift 5.3"
             firewalk: "brew install alamofire/alamofire/firewalk && firewalk &"
             shell: "/bin/zsh {0}"
     steps:

+ 1 - 1
Source/ServerTrustEvaluation.swift

@@ -604,7 +604,7 @@ extension AlamofireExtension where ExtendedType == SecTrust {
         certificates.af.publicKeys
     }
 
-    #if swift(>=5.5) // Xcode 13 / 2021 SDKs.
+    #if swift(>=5.5.1) // Xcode 13.1 / 2021 SDKs.
     /// The `SecCertificate`s contained in `self`.
     public var certificates: [SecCertificate] {
         if #available(iOS 15, macOS 12, tvOS 15, watchOS 8, *) {