Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
philprime authored Nov 5, 2024
2 parents bceb520 + 337f792 commit bb45b44
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 33 deletions.
33 changes: 24 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,25 @@ concurrency:
jobs:
unit-tests:
name: Unit Tests (${{ matrix.build.sdk }})
runs-on: macos-14
runs-on: ${{ matrix.build.runs-on }}
timeout-minutes: 30
strategy:
matrix:
build: [
{ sdk: 'iphonesimulator', destination: 'platform=iOS Simulator,OS=17.5,name=iPhone 15 Pro', action: 'test' },
{ sdk: 'xros', destination: 'platform=visionOS Simulator,OS=1.2,name=Apple Vision Pro', action: 'build' }
]
build:
[
{
sdk: "iphonesimulator",
destination: "platform=iOS Simulator,OS=18.0,name=iPhone 16 Pro",
action: "test",
runs-on: "macos-14",
},
{
sdk: "xros",
destination: "platform=visionOS Simulator,OS=2.1,name=Apple Vision Pro",
action: "build",
runs-on: "macos-15",
},
]
steps:
- name: Checkout the repository
uses: actions/checkout@v4
Expand All @@ -30,8 +41,10 @@ jobs:
xcode-version: latest-stable
- name: Check environment
run: |
xcodebuild -version
swift --version
set -ex
xcodebuild -version
swift --version
xcrun simctl list
- name: Run Tests
run: |
set -o pipefail && \
Expand Down Expand Up @@ -78,8 +91,10 @@ jobs:
xcode-version: latest-stable
- name: Check environment
run: |
xcodebuild -version
swift --version
set -ex
xcodebuild -version
swift --version
xcrun simctl list
- name: Run tests
run: swift test --parallel --enable-code-coverage
- name: Generate code coverage reports
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.3.6
48 changes: 25 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,33 @@ GEM
base64
nkf
rexml
activesupport (7.1.4)
activesupport (7.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
benchmark (0.3.0)
bigdecimal (3.1.8)
claide (1.1.0)
clamp (1.3.2)
cocoapods (1.15.2)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -42,8 +45,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -63,20 +66,20 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jazzy (0.15.2)
jazzy (0.15.3)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4 (~> 1.3)
Expand All @@ -86,14 +89,14 @@ GEM
sassc (~> 2.1)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
json (2.7.2)
json (2.7.6)
liferaft (0.0.6)
logger (1.6.1)
mini_portile2 (2.8.7)
minitest (5.22.3)
minitest (5.25.1)
molinillo (0.8.0)
mustache (1.1.1)
mutex_m (0.2.0)
nanaimo (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
Expand All @@ -104,34 +107,33 @@ GEM
public_suffix (4.0.7)
racc (1.7.3)
redcarpet (3.6.0)
rexml (3.2.9)
strscan
rexml (3.3.9)
rouge (2.0.7)
ruby-macho (2.5.1)
sassc (2.4.0)
ffi (~> 1.9)
slather (2.8.3)
securerandom (0.3.1)
slather (2.8.4)
CFPropertyList (>= 2.2, < 4)
activesupport
clamp (~> 1.3)
nokogiri (>= 1.14.3)
xcodeproj (~> 1.21)
xcodeproj (~> 1.25)
sqlite3 (1.7.3)
mini_portile2 (~> 2.8.0)
strscan (3.1.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.24.0)
xcodeproj (1.27.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)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)

Expand Down

0 comments on commit bb45b44

Please sign in to comment.