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.

Sign up for GitHub

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

Revert Xcode 15 Runner Image Change #434

Merged
merged 5 commits into from
Oct 25, 2023
+14 −14
Merged

Revert Xcode 15 Runner Image Change #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ddd8e6
Xcode 14 runner and specify OS version for UITest workflow
jaxdesmarais Oct 24, 2023
6781de2
add missing space
jaxdesmarais Oct 24, 2023
fe41bfa
update runner for unit test as well
jaxdesmarais Oct 24, 2023
2991c37
revert Xcode 15 runners in all .yml’s
jaxdesmarais Oct 25, 2023
9d4b714
update build headers
jaxdesmarais Oct 25, 2023
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
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ name: Build
on: [pull_request, workflow_dispatch]
jobs:
cocoapods:
name: CocoaPods (Xcode 15)
name: CocoaPods (Xcode 14)
runs-on: macOS-13
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Use Xcode 15
run: sudo xcode-select -switch /Applications/Xcode_15.0.app
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Run pod lib lint
run: pod lib lint
spm:
name: SPM (Xcode 15)
name: SPM (Xcode 14)
runs-on: macOS-13
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Use Xcode 15
run: sudo xcode-select -switch /Applications/Xcode_15.0.app
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Use current branch
run: sed -i '' 's/branch = .*/branch = \"'"$GITHUB_HEAD_REF"'\";/' SampleApps/SPMTest/SPMTest.xcodeproj/project.pbxproj
- name: Run swift package resolve
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
with:
fetch-depth: 0

- name: Use Xcode 15
run: sudo xcode-select -switch /Applications/Xcode_15.0.app
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app

- name: Check for unreleased section in changelog
run: grep "## unreleased" CHANGELOG.md || (echo "::error::No unreleased section found in CHANGELOG"; exit 1)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Use Xcode 15
run: sudo xcode-select -switch /Applications/Xcode_15.0.app
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Run Unit Tests
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 15,platform=iOS Simulator' test | xcpretty
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 14,OS=16.4,platform=iOS Simulator' test | xcpretty
ui_test_job:
name: UI
runs-on: macOS-13
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Use Xcode 15
run: sudo xcode-select -switch /Applications/Xcode_15.0.app
- name: Use Xcode 14.3.1
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
- name: Run UI Tests
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UITests' -destination 'name=iPhone 15,platform=iOS Simulator' test | xcpretty
run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UITests' -destination 'name=iPhone 14,OS=16.4,platform=iOS Simulator' test | xcpretty
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest iOS version provided by Xcode is what this defaults to. Isn't 16.4 the latest the Xcode 14.3 offers? See https://xcodereleases.com/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like iOS 17 may be the default for the runner but you may be right, it's a bit unclear. Was looking at this issue: actions/runner-images#8023

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does seem to have failed faster but not sure if that is accurate. We can also merge main into the 2 latest PRs to see if the Xcode 15 changes help there. 🤷

Loading