Skip to content

Commit e7884cc

Browse files
heckjheckj
authored
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
1 parent 3165ce2 commit e7884cc

File tree

5 files changed

+34
-37
lines changed

5 files changed

+34
-37
lines changed

‎.github/workflows/iostest.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on: [push]
44

55
jobs:
66
test-adoc-generation:
@@ -16,46 +16,46 @@ jobs:
1616
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
1717
# results to appear in the directory 'output'
1818

19-
build:
19+
# build:
2020

21-
runs-on: macos-11
21+
# runs-on: macos-14
2222
#env:
2323
# sets the version of Xcode to utilize within the VM for all steps
2424
# DEVELOPER_DIR: /Applications/Xcode_13.app/Contents/Developer
25-
steps:
26-
- uses: actions/checkout@v2
25+
# steps:
26+
# - uses: actions/checkout@v2
2727

2828
# - name: docker version
2929
# run: docker -v
3030

3131
# - name: docker help
3232
# run: docker --help
3333

34-
- name: Show what's in Applications
35-
run: ls -al /Applications
34+
# - name: Show what's in Applications
35+
# run: ls -al /Applications
3636

3737
# - name: xcodebuild --help
3838
# run: xcodebuild --help
3939

40-
- name: xcodebuild --showsdks
41-
run: xcodebuild -showsdks
40+
# - name: xcodebuild --showsdks
41+
# run: xcodebuild -showsdks
4242

4343
# - name: xcodebuild -showBuildSettings
4444
# run: xcodebuild -showBuildSettings
4545

4646
# - name: xcodebuild -showTestPlans
4747
# run: xcodebuild -showTestPlans
4848

49-
- name: xcodebuild -list
50-
run: xcodebuild -list
49+
# - name: xcodebuild -list
50+
# run: xcodebuild -list
5151

52-
- name: Show available destinations
53-
run: xcodebuild -scheme SwiftUI-Notes -showdestinations
52+
# - name: Show available destinations
53+
# run: xcodebuild -scheme SwiftUI-Notes -showdestinations
5454

55-
- name: Run the Combine test suite
56-
run: |
57-
xcodebuild -scheme SwiftUI-Notes \
58-
-configuration Debug \
59-
-sdk iphonesimulator15.0 \
60-
-destination 'platform=iOS Simulator,OS=15.0,name=iPhone 8' \
61-
test -showBuildTimingSummary
55+
# - name: Run the Combine test suite (iOS)
56+
# run: |
57+
# xcodebuild -scheme SwiftUI-Notes \
58+
# -configuration Debug \
59+
# -sdk iphonesimulator17.0 \
60+
# -destination 'platform=iOS Simulator,OS=17.5,name=iPhone 14' \
61+
# test -showBuildTimingSummary

‎.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: generate zh-CN html with asciidoctor from docs/
2727
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
28-
# results to appear in the directory 'output', which on GH action is owned by root, not `me`
28+
# results to appear in the directory 'output', which on GH action is owned by root, not `me`
2929

3030
- name: permission check
3131
run: ls -altr

‎SwiftUI-Notes.xcodeproj/project.pbxproj

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -476,8 +476,9 @@
476476
1AC8C76D22B1BED80064C1AE /* Project object */ = {
477477
isa = PBXProject;
478478
attributes = {
479+
BuildIndependentTargetsInParallel = YES;
479480
LastSwiftUpdateCheck = 1100;
480-
LastUpgradeCheck = 1210;
481+
LastUpgradeCheck = 1540;
481482
ORGANIZATIONNAME = "SwiftUI-Notes";
482483
TargetAttributes = {
483484
1A6006DD22D267F10030A471 = {
@@ -753,7 +754,6 @@
753754
isa = XCBuildConfiguration;
754755
buildSettings = {
755756
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
756-
BUNDLE_LOADER = "$(TEST_HOST)";
757757
CODE_SIGN_STYLE = Automatic;
758758
DEVELOPMENT_TEAM = BDV4VC27D3;
759759
INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -766,15 +766,14 @@
766766
PRODUCT_NAME = "$(TARGET_NAME)";
767767
SWIFT_VERSION = 5.0;
768768
TARGETED_DEVICE_FAMILY = "1,2";
769-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
769+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UIKit-Combine";
770770
};
771771
name = Debug;
772772
};
773773
1A6006FD22D267F30030A471 /* Release */ = {
774774
isa = XCBuildConfiguration;
775775
buildSettings = {
776776
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
777-
BUNDLE_LOADER = "$(TEST_HOST)";
778777
CODE_SIGN_STYLE = Automatic;
779778
DEVELOPMENT_TEAM = BDV4VC27D3;
780779
INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -787,7 +786,7 @@
787786
PRODUCT_NAME = "$(TARGET_NAME)";
788787
SWIFT_VERSION = 5.0;
789788
TARGETED_DEVICE_FAMILY = "1,2";
790-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
789+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UIKit-Combine";
791790
};
792791
name = Release;
793792
};
@@ -828,6 +827,7 @@
828827
DEBUG_INFORMATION_FORMAT = dwarf;
829828
ENABLE_STRICT_OBJC_MSGSEND = YES;
830829
ENABLE_TESTABILITY = YES;
830+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
831831
GCC_C_LANGUAGE_STANDARD = gnu11;
832832
GCC_DYNAMIC_NO_PIC = NO;
833833
GCC_NO_COMMON_BLOCKS = YES;
@@ -889,6 +889,7 @@
889889
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
890890
ENABLE_NS_ASSERTIONS = NO;
891891
ENABLE_STRICT_OBJC_MSGSEND = YES;
892+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
892893
GCC_C_LANGUAGE_STANDARD = gnu11;
893894
GCC_NO_COMMON_BLOCKS = YES;
894895
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -955,7 +956,6 @@
955956
isa = XCBuildConfiguration;
956957
buildSettings = {
957958
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
958-
BUNDLE_LOADER = "$(TEST_HOST)";
959959
CODE_SIGN_STYLE = Automatic;
960960
DEVELOPMENT_TEAM = BDV4VC27D3;
961961
INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -968,15 +968,14 @@
968968
PRODUCT_NAME = "$(TARGET_NAME)";
969969
SWIFT_VERSION = 5.0;
970970
TARGETED_DEVICE_FAMILY = "1,2";
971-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
971+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
972972
};
973973
name = Debug;
974974
};
975975
1AC8C79922B1BED90064C1AE /* Release */ = {
976976
isa = XCBuildConfiguration;
977977
buildSettings = {
978978
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
979-
BUNDLE_LOADER = "$(TEST_HOST)";
980979
CODE_SIGN_STYLE = Automatic;
981980
DEVELOPMENT_TEAM = BDV4VC27D3;
982981
INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -989,14 +988,13 @@
989988
PRODUCT_NAME = "$(TARGET_NAME)";
990989
SWIFT_VERSION = 5.0;
991990
TARGETED_DEVICE_FAMILY = "1,2";
992-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
991+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
993992
};
994993
name = Release;
995994
};
996995
1AEA9C2B22CD5FE7006709F1 /* Debug */ = {
997996
isa = XCBuildConfiguration;
998997
buildSettings = {
999-
BUNDLE_LOADER = "$(TEST_HOST)";
1000998
CODE_SIGN_STYLE = Automatic;
1001999
DEVELOPMENT_TEAM = BDV4VC27D3;
10021000
INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1009,14 +1007,13 @@
10091007
PRODUCT_NAME = "$(TARGET_NAME)";
10101008
SWIFT_VERSION = 5.0;
10111009
TARGETED_DEVICE_FAMILY = "1,2";
1012-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
1010+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
10131011
};
10141012
name = Debug;
10151013
};
10161014
1AEA9C2C22CD5FE7006709F1 /* Release */ = {
10171015
isa = XCBuildConfiguration;
10181016
buildSettings = {
1019-
BUNDLE_LOADER = "$(TEST_HOST)";
10201017
CODE_SIGN_STYLE = Automatic;
10211018
DEVELOPMENT_TEAM = BDV4VC27D3;
10221019
INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1029,7 +1026,7 @@
10291026
PRODUCT_NAME = "$(TARGET_NAME)";
10301027
SWIFT_VERSION = 5.0;
10311028
TARGETED_DEVICE_FAMILY = "1,2";
1032-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
1029+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SwiftUI-Notes";
10331030
};
10341031
name = Release;
10351032
};

‎SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/SwiftUI-Notes.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/UIKit-Combine.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)