CI update to shift off macOS-11 runner due to deprecation (#261)

* CI update to shift off macOS-11 runner due to deprecation * only run on push * these are legacy tests at this point, so I'm not going to maintain the quirky CI for the iOS tests, but they still work locally
heckj · May 20, 2024 · e7884cc · e7884cc
1 parent 3165ce2
commit e7884cc
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 37 deletions.
diff --git a/.github/workflows/iostest.yml b/.github/workflows/iostest.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test-adoc-generation:
@@ -16,46 +16,46 @@ jobs:
       run: docker run --rm -v $(pwd):/documents/ --name asciidoc-to-html heckj/docker-asciidoctor asciidoctor -v -t -D /documents/output -r ./docs/lib/google-analytics-docinfoprocessor.rb docs/using-combine-book.adoc
       # results to appear in the directory 'output'
 
-  build:
+  # build:
 
-    runs-on: macos-11
+    # runs-on: macos-14
     #env:
       # sets the version of Xcode to utilize within the VM for all steps
       # DEVELOPER_DIR: /Applications/Xcode_13.app/Contents/Developer
-    steps:
-    - uses: actions/checkout@v2
+    # steps:
+    # - uses: actions/checkout@v2
 
     # - name: docker version
     #   run: docker -v
 
     # - name: docker help
     #   run: docker --help
 
-    - name: Show what's in Applications
-      run: ls -al /Applications
+    # - name: Show what's in Applications
+    #   run: ls -al /Applications
 
     # - name: xcodebuild --help
     #  run: xcodebuild --help
 
-    - name: xcodebuild --showsdks
-      run: xcodebuild -showsdks
+    # - name: xcodebuild --showsdks
+    #   run: xcodebuild -showsdks
 
     # - name: xcodebuild -showBuildSettings
     #   run: xcodebuild -showBuildSettings
 
     # - name: xcodebuild -showTestPlans
     #   run: xcodebuild -showTestPlans
 
-    - name: xcodebuild -list
-      run: xcodebuild -list
+    # - name: xcodebuild -list
+    #   run: xcodebuild -list
 
-    - name: Show available destinations
-      run: xcodebuild -scheme SwiftUI-Notes -showdestinations
+    # - name: Show available destinations
+    #   run: xcodebuild -scheme SwiftUI-Notes -showdestinations
 
-    - name: Run the Combine test suite
-      run: |
-        xcodebuild -scheme SwiftUI-Notes \
-        -configuration Debug \
-        -sdk iphonesimulator15.0 \
-        -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 8' \
-        test -showBuildTimingSummary
+    # - name: Run the Combine test suite (iOS)
+    #   run: |
+    #     xcodebuild -scheme SwiftUI-Notes \
+    #     -configuration Debug \
+    #     -sdk iphonesimulator17.0 \
+    #     -destination 'platform=iOS Simulator,OS=17.5,name=iPhone 14' \
+    #     test -showBuildTimingSummary
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,7 +25,7 @@ jobs:
 
     - name: generate zh-CN html with asciidoctor from docs/
       run: docker run --rm -v $(pwd):/documents/ --name asciidoc-to-html heckj/docker-asciidoctor asciidoctor -v -t -D /documents/output -r ./docs/lib/google-analytics-docinfoprocessor.rb docs_zh-CN/using-combine_zh-CN.adoc
-      # results to appear in the directory 'output', which on GH action is owned by root, not `me` 
+      # results to appear in the directory 'output', which on GH action is owned by root, not `me`
 
     - name: permission check
       run: ls -altr

diff --git a/SwiftUI-Notes.xcodeproj/project.pbxproj b/SwiftUI-Notes.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -476,8 +476,9 @@
 		1AC8C76D22B1BED80064C1AE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1540;
 				ORGANIZATIONNAME = "SwiftUI-Notes";
 				TargetAttributes = {
 					1A6006DD22D267F10030A471 = {
@@ -753,7 +754,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -766,15 +766,14 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UIKit-Combine";
 			};
 			name = Debug;
 		};
 		1A6006FD22D267F30030A471 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -787,7 +786,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UIKit-Combine";
 			};
 			name = Release;
 		};
@@ -828,6 +827,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -889,6 +889,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -955,7 +956,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -968,15 +968,14 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
 			};
 			name = Debug;
 		};
 		1AC8C79922B1BED90064C1AE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -989,14 +988,13 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
 			};
 			name = Release;
 		};
 		1AEA9C2B22CD5FE7006709F1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1009,14 +1007,13 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
 			};
 			name = Debug;
 		};
 		1AEA9C2C22CD5FE7006709F1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1029,7 +1026,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
 			};
 			name = Release;
 		};

diff --git a/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/SwiftUI-Notes.xcscheme b/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/SwiftUI-Notes.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/UIKit-Combine.xcscheme b/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/UIKit-Combine.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"