Merge pull request #111 from unsignedapps/macos-12

Removed deprecated macOS 10.15 and added latest Xcode versions under macOS 12
unsignedapps · Jun 10, 2023 · 6b8a039 · 6b8a039
2 parents 6f4df40 + 7a0090b
commit 6b8a039
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 52 deletions.
diff --git a/.github/workflows/ios-tests.yml b/.github/workflows/ios-tests.yml
@@ -34,7 +34,7 @@ jobs:
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
+        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -55,18 +55,18 @@ jobs:
         if: ${{ needs.build-ios-macos-11-matrix.result == 'failure' }}
         run: exit 1
 
-  ########################
-  # macOS 10.15 Versions #
-  ########################
+  #####################
+  # macOS 12 Versions #
+  #####################
 
-  build-ios-macos-10_15-matrix:
-    name: iOS Matrix - macOS 10.15
-    runs-on: macos-10.15
+  build-ios-macos-12-matrix:
+    name: iOS Matrix - macOS 12
+    runs-on: macos-12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12", "12.1", "12.2", "12.3", "12.4" ]
+        xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -77,12 +77,12 @@ jobs:
       - name: Build and Test
         run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=iOS Simulator,name=iPhone 8"
 
-  build-ios-macos-10_15:
+  build-ios-macos-12:
     runs-on: ubuntu-latest
-    name: iOS Tests - macOS 10.15
+    name: iOS Tests - macOS 12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
-    needs: build-ios-macos-10_15-matrix
+    needs: build-ios-macos-12-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-ios-macos-11-matrix.result == 'failure' }}
+        if: ${{ needs.build-ios-macos-12-matrix.result == 'failure' }}
         run: exit 1
diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml
@@ -34,9 +34,22 @@ jobs:
     needs: check-changes
     strategy:
       matrix:
-        swift: [ "5.2.5", "5.3", "5.3.1", "5.3.2", "5.3.3", "5.4.1", "5.4.2", "5.5.0", "5.5.1" ]
-        os: [ amazonlinux2, bionic, centos7, centos8, focal, xenial ]
-
+        swift: [ "5.2.5", "5.3.3", "5.4.3", "5.5.3", "5.6.3", "5.7.3" ]
+        os: [ amazonlinux2, bionic, centos7, focal, jammy ]
+        exclude:
+          - swift: 5.2.5
+            os: jammy
+          - swift: 5.3.3
+            os: jammy
+          - swift: 5.4.3
+            os: jammy
+          - swift: 5.5.3
+            os: jammy
+          - swift: 5.6.3
+            os: jammy
+          - swift: 5.7.3
+            os: centos7
+
     container:
       image: swift:${{ matrix.swift }}-${{ matrix.os }}
 

diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml
@@ -34,7 +34,7 @@ jobs:
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
+        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -55,18 +55,18 @@ jobs:
         if: ${{ needs.build-macos-macos-11-matrix.result == 'failure' }}
         run: exit 1
 
-  ###############
-  # macOS 10.15 #
-  ###############
+  ############
+  # macOS 12 #
+  ############
 
-  build-macos-macos-10_15-matrix:
-    name: macOS Matrix - macOS 10.15
-    runs-on: macos-10.15
+  build-macos-macos-12-matrix:
+    name: macOS Matrix - macOS 12
+    runs-on: macos-12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12", "12.1", "12.2", "12.3", "12.4" ]
+        xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -77,12 +77,12 @@ jobs:
       - name: Build and Test
         run: swift
 
-  build-macos-macos-10_15:
+  build-macos-macos-12:
     runs-on: ubuntu-latest
-    name: macOS Tests - macOS 10.15
+    name: macOS Tests - macOS 12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
-    needs: build-macos-macos-10_15-matrix
+    needs: build-macos-macos-12-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-macos-macos-10_15-matrix.result == 'failure' }}
+        if: ${{ needs.build-macos-macos-12-matrix.result == 'failure' }}
         run: exit 1
diff --git a/.github/workflows/tvos-tests.yml b/.github/workflows/tvos-tests.yml
@@ -34,7 +34,7 @@ jobs:
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
+        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -55,18 +55,18 @@ jobs:
         if: ${{ needs.build-tvos-macos-11-matrix.result == 'failure' }}
         run: exit 1
 
-  ########################
-  # macOS 10.15 Versions #
-  ########################
+  #####################
+  # macOS 12 Versions #
+  #####################
 
-  build-tvos-macos-10_15-matrix:
-    name: tvOS Matrix - macOS 10.15
-    runs-on: macos-10.15
+  build-tvos-macos-12-matrix:
+    name: tvOS Matrix - macOS 12
+    runs-on: macos-12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12", "12.1", "12.2", "12.3", "12.4" ]
+        xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -75,14 +75,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build and Test
-        run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=tvOS Simulator,name=Apple TV 4K"
+        run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=tvOS Simulator,name=Apple TV 4K (2nd generation)"
 
-  build-tvos-macos-10_15:
+  build-tvos-macos-12:
     runs-on: ubuntu-latest
-    name: tvOS Tests - macOS 10.15
+    name: tvOS Tests - macOS 12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
-    needs: build-tvos-macos-10_15-matrix
+    needs: build-tvos-macos-12-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-tvos-macos-10_15-matrix.result == 'failure' }}
+        if: ${{ needs.build-tvos-macos-12-matrix.result == 'failure' }}
         run: exit 1
diff --git a/.github/workflows/watchos-tests.yml b/.github/workflows/watchos-tests.yml
@@ -34,7 +34,7 @@ jobs:
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
+        xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -55,18 +55,18 @@ jobs:
         if: ${{ needs.build-watchos-macos-11-matrix.result == 'failure' }}
         run: exit 1
 
-  ########################
-  # macOS 10.15 Versions #
-  ########################
+  #####################
+  # macOS 12 Versions #
+  #####################
 
-  build-watchos-macos-10_15-matrix:
-    name: watchOS Matrix - macOS 10.15
-    runs-on: macos-10.15
+  build-watchos-macos-12-matrix:
+    name: watchOS Matrix - macOS 12
+    runs-on: macos-12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
       matrix:
-        xcode: [ "11.7", "12", "12.1", "12.2", "12.3", "12.4" ]
+        xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
 
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
@@ -77,12 +77,12 @@ jobs:
       - name: Build and Test
         run: swift package generate-xcodeproj && xcrun xcodebuild build -scheme "Vexil-Package" -destination "generic/platform=watchos"
 
-  build-watchos-macos-10_15:
+  build-watchos-macos-12:
     runs-on: ubuntu-latest
-    name: watchOS Build - macOS 10.15
+    name: watchOS Build - macOS 12
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
-    needs: build-watchos-macos-10_15-matrix
+    needs: build-watchos-macos-12-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-watchos-macos-10_15-matrix.result == 'failure' }}
+        if: ${{ needs.build-watchos-macos-12-matrix.result == 'failure' }}
         run: exit 1