Skip to content

Commit

Permalink
Fix CI for Xcode 15.3 & iOS 17
Browse files Browse the repository at this point in the history
Disable Linux, for now

Xcode 15.3

endless fixes

Move foo test class out of test

vision darwin

macOS arch

more

beautify

Use built-in Swift runtime
  • Loading branch information
freak4pc committed Apr 21, 2024
1 parent de14b86 commit 1198683
Show file tree
Hide file tree
Showing 11 changed files with 198 additions and 116 deletions.
29 changes: 17 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
workflow_dispatch:

jobs:
xcode14:
name: "Xcode 14"
runs-on: macos-latest
xcode15:
name: "Xcode 15"
runs-on: macos-14

strategy:
fail-fast: false
Expand All @@ -19,15 +19,20 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Select Xcode 15.3
run: sudo xcode-select -s /Applications/Xcode_15.3.app
- name: Run Tests
run: CI=1 ./scripts/all-tests.sh "${{ matrix.environment }}"
linux:
name: "Test (Linux)"
runs-on: ubuntu-latest

# We're having some issues with the Linux tests, so we're disabling them for now.
# Hopefully we'll be able to fix and re-enable them soon.
# Even more hopefully that I won't git blame this comment in the future and see it was 5 years ago :)

steps:
- name: Swift 5.5 Docker Container
uses: docker://swift:5.5.0-slim
- uses: actions/checkout@v3
- name: Run tests
run: CI=1 ./scripts/all-tests.sh "Unix"
# linux:
# name: "Test (Linux)"
# runs-on: ubuntu-latest

# steps:
# - uses: actions/checkout@v3
# - name: Run tests
# run: CI=1 ./scripts/all-tests.sh "Unix"
1 change: 0 additions & 1 deletion .jazzy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ custom_categories:
- RxCollectionViewDataSourcePrefetchingProxy
- RxCollectionViewDataSourceProxy
- RxCollectionViewDelegateProxy
- RxDelegateProxyCrashFix
- RxNavigationControllerDelegateProxy
- RxPickerViewDataSourceProxy
- RxPickerViewDelegateProxy
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ All contributions are handled via Pull Requests (PRs). Your PR _must_ target the

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.

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

`sudo gem install xcpretty`
`brew install xcbeautify`

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).

Expand Down
2 changes: 1 addition & 1 deletion Platform/Platform.Darwin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2015 Krunoslav Zaher. All rights reserved.
//

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

import Darwin
import Foundation
Expand Down
Loading

0 comments on commit 1198683

Please sign in to comment.