Fix Tests (#230)

FluidGroup · Mar 22, 2024 · 29815ac · 29815ac
1 parent 9dbb928
commit 29815ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 30 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -4,48 +4,26 @@ on:
   push:
 
 jobs:
-  swiftuidemo:
-    runs-on: macos-12
-
-    steps:
-      - uses: maxim-lobanov/setup-xcode@v1.1
-        with:
-          xcode-version: "14.2"
-      - uses: actions/checkout@v2
-      - name: Build demo app
-        run: xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme SwiftUIDemo -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
-
-  demo:
-    runs-on: macos-12
-
-    steps:
-      - uses: maxim-lobanov/setup-xcode@v1.1
-        with:
-          xcode-version: "14.2"
-      - uses: actions/checkout@v2
-      - name: Build demo app
-        run: xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme Demo -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
-
   test:
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1.1
         with:
-          xcode-version: "14.2"
+          xcode-version: "15.2"
       - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Test
-        run: xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme BrightroomEngineTests test -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
+        run: set -o pipefail && xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme BrightroomEngineTests test -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.0.1'  -skipMacroValidation -skipPackagePluginValidation | xcpretty
 
   swiftpm:
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1.1
         with:
-          xcode-version: "14.2"
+          xcode-version: "15.2"
       - uses: actions/checkout@v2
       - name: Build
-        run: xcodebuild -scheme BrightroomUI -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
+        run: xcodebuild -scheme BrightroomUI -destination 'generic/platform=iOS Simulator'  -skipMacroValidation -skipPackagePluginValidation | xcpretty
diff --git a/Dev/Brightroom.xcodeproj/project.pbxproj b/Dev/Brightroom.xcodeproj/project.pbxproj
@@ -2727,7 +2727,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = JX92XL88RZ;
 				INFOPLIST_FILE = "Tests/$(TARGET_NAME)/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2747,7 +2747,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = JX92XL88RZ;
 				INFOPLIST_FILE = "Tests/$(TARGET_NAME)/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",