Move CI to Xcode 15.3, macOS 14 (#5)

johnfairh · Apr 9, 2024 · a17e507 · a17e507
1 parent a658e14
commit a17e507
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,18 +12,21 @@ jobs:
   linux:
     name: Linux SPM unit tests
     runs-on: ubuntu-latest
+    container:
+      image: swift:5.10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run tests
-        run: make test
+        run: swift test
 
-  macos11:
-    name: macOS 12 tests
-    runs-on: macos-12
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+  macos:
+    name: macOS tests
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v2
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 15.3
+      - uses: actions/checkout@v4
       - name: SPM tests
         run: make test
       - name: Normalize coverage info
@@ -40,8 +43,8 @@ jobs:
     steps:
       - uses: compnerd/gha-setup-swift@main
         with:
-          branch: swift-5.7-release
-          tag: 5.7-RELEASE
-      - uses: actions/checkout@v2
+          branch: swift-5.10-release
+          tag: 5.10-RELEASE
+      - uses: actions/checkout@v4
       - name: Run tests
         run: swift test -v --enable-test-discovery
diff --git a/SourceMapper.xcodeproj/project.pbxproj b/SourceMapper.xcodeproj/project.pbxproj
@@ -519,6 +519,7 @@
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE DEBUG";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				USE_HEADERMAP = NO;
 			};
 			name = Debug;
@@ -593,6 +594,7 @@
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				USE_HEADERMAP = NO;
 			};
 			name = Release;