Skip to content

Commit

Permalink
Update CI jobs to run on Apple Silicon macOS 14 runner (#2306)
Browse files Browse the repository at this point in the history
  • Loading branch information
calda committed Feb 1, 2024
1 parent 99c2f68 commit 2aa558f
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 41 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

build-package:
name: "Build Package"
runs-on: macos-13
runs-on: macos-14
strategy:
fail-fast: false
matrix:
Expand All @@ -44,7 +44,7 @@ jobs:

build-example:
name: "Build Example App"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand All @@ -55,7 +55,7 @@ jobs:

test-package:
name: "Test Package"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand All @@ -75,7 +75,7 @@ jobs:

emerge-upload:
name: "Emerge Upload"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:

build-xcframework-with-visionOS-support:
name: "Build XCFramework"
runs-on: macos-13
runs-on: macos-14
strategy:
matrix:
xcode:
Expand All @@ -146,7 +146,7 @@ jobs:

cocoapod:
name: "Lint CocoaPods podspec"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand All @@ -157,7 +157,7 @@ jobs:

spm-xcode-15:
name: "Test Swift Package Manager"
runs-on: macos-13
runs-on: macos-14
strategy:
matrix:
xcode:
Expand All @@ -173,7 +173,7 @@ jobs:

carthage:
name: "Test Carthage support"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand All @@ -186,7 +186,7 @@ jobs:

swiftlint:
name: "Lint Swift"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand All @@ -195,7 +195,7 @@ jobs:

embedded-libraries:
name: "Lint Embedded Libraries"
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: ./.github/actions/setup
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org' do
gem 'cocoapods', '~> 1.11.0'
gem 'cocoapods', '~> 1.15.0'
gem "rake", "~> 13.0.0"
gem 'git', '~> 1.18'
end
50 changes: 25 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ GEM
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
CFPropertyList (3.0.6)
rexml
activesupport (6.1.4.1)
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -18,27 +18,27 @@ GEM
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.11.2)
claide (1.1.0)
cocoapods (1.15.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.11.2)
cocoapods-core (= 1.15.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.2)
activesupport (>= 5.0, < 7)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
Expand All @@ -48,7 +48,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -57,51 +57,51 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.3)
escape (0.0.4)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.15.4)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
httpclient (2.8.3)
i18n (1.8.11)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.1)
minitest (5.14.4)
json (2.7.1)
minitest (5.21.2)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
rake (13.0.6)
rchardet (1.8.0)
rexml (3.2.5)
rexml (3.2.6)
ruby-macho (2.5.1)
typhoeus (1.4.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.4)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.21.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.5.1)
zeitwerk (2.6.12)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.11.0)!
cocoapods (~> 1.15.0)!
git (~> 1.18)!
rake (~> 13.0.0)!

BUNDLED WITH
2.2.16
2.3.19
5 changes: 0 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,5 @@ def ifVisionOSEnabled
end

def installVisionOSIfNecessary
# visionOS is unsupported by default on Intel, but we can override this
# https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070
sh 'defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES'
sh 'defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES'

xcodebuild("-downloadPlatform visionOS")
end

0 comments on commit 2aa558f

Please sign in to comment.