Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/iostest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI

on: [push, pull_request]
on: [push]

jobs:
test-adoc-generation:
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 11 additions & 14 deletions SwiftUI-Notes.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -476,8 +476,9 @@
1AC8C76D22B1BED80064C1AE /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1100;
LastUpgradeCheck = 1210;
LastUpgradeCheck = 1540;
ORGANIZATIONNAME = "SwiftUI-Notes";
TargetAttributes = {
1A6006DD22D267F10030A471 = {
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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;
};
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading