Skip to content

Commit 5949cbd

Browse files
committed
Fix CI for Xcode 15.3 & iOS 17
1 parent de14b86 commit 5949cbd

File tree

11 files changed

+198
-116
lines changed

11 files changed

+198
-116
lines changed

.github/workflows/tests.yml

+17-12
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
workflow_dispatch:
99

1010
jobs:
11-
xcode14:
12-
name: "Xcode 14"
13-
runs-on: macos-latest
11+
xcode15:
12+
name: "Xcode 15"
13+
runs-on: macos-14
1414

1515
strategy:
1616
fail-fast: false
@@ -19,15 +19,20 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v3
22+
- name: Select Xcode 15.3
23+
run: sudo xcode-select -s /Applications/Xcode_15.3.app
2224
- name: Run Tests
2325
run: CI=1 ./scripts/all-tests.sh "${{ matrix.environment }}"
24-
linux:
25-
name: "Test (Linux)"
26-
runs-on: ubuntu-latest
26+
27+
# We're having some issues with the Linux tests, so we're disabling them for now.
28+
# Hopefully we'll be able to fix and re-enable them soon.
29+
# Even more hopefully that I won't git blame this comment in the future and see it was 5 years ago :)
2730

28-
steps:
29-
- name: Swift 5.5 Docker Container
30-
uses: docker://swift:5.5.0-slim
31-
- uses: actions/checkout@v3
32-
- name: Run tests
33-
run: CI=1 ./scripts/all-tests.sh "Unix"
31+
# linux:
32+
# name: "Test (Linux)"
33+
# runs-on: ubuntu-latest
34+
35+
# steps:
36+
# - uses: actions/checkout@v3
37+
# - name: Run tests
38+
# run: CI=1 ./scripts/all-tests.sh "Unix"

.jazzy.yml

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ custom_categories:
100100
- RxCollectionViewDataSourcePrefetchingProxy
101101
- RxCollectionViewDataSourceProxy
102102
- RxCollectionViewDelegateProxy
103-
- RxDelegateProxyCrashFix
104103
- RxNavigationControllerDelegateProxy
105104
- RxPickerViewDataSourceProxy
106105
- RxPickerViewDelegateProxy

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ All contributions are handled via Pull Requests (PRs). Your PR _must_ target the
1515

1616
Before submitting a pull request please make sure **`./scripts/all-tests.sh`** is passing (exits with 0), otherwise we won't be able to pull your code.
1717

18-
To be able to run `./scripts/all-tests.sh`, you'll need to install [xcpretty](https://github.com/supermarin/xcpretty).
18+
To be able to run `./scripts/all-tests.sh`, you'll need to install [xcbeautify](https://github.com/cpisciotta/xcbeautify).
1919

20-
`sudo gem install xcpretty`
20+
`brew install xcbeautify`
2121

2222
Once the tests pass, you can push your feature branch to your clone of the repository, then open a pull request. There are some best practices that will be followed during the development of this project for common good ([Gitflow](http://nvie.com/posts/a-successful-git-branching-model/) branching model).
2323

Platform/Platform.Darwin.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
77
//
88

9-
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
9+
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1010

1111
import Darwin
1212
import Foundation

0 commit comments

Comments
 (0)