Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
stephencelis committed Mar 12, 2024
1 parent 8cb7709 commit 707ee19
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 61 deletions.
36 changes: 13 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ concurrency:
cancel-in-progress: true

jobs:
macos-13:
name: macOS 13 (Xcode ${{ matrix.xcode }})
macos-14:
name: macOS 14 (Xcode ${{ matrix.xcode }})
runs-on: macOS-13
strategy:
matrix:
xcode:
- '14.3.1'
- '15.2'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Print Swift version
Expand All @@ -32,18 +32,15 @@ jobs:
- name: Run tests (platforms)
run: make test-platforms

macos-12:
name: macOS 12 (Xcode ${{ matrix.xcode }})
runs-on: macOS-12
macos-13:
name: macOS 13 (Xcode ${{ matrix.xcode }})
runs-on: macOS-13
strategy:
matrix:
xcode:
- '13.3.1'
- '13.4.1'
- '14.0.1'
- '14.1'
- '14.3.1'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Print Swift version
Expand All @@ -59,12 +56,10 @@ jobs:
strategy:
matrix:
swift:
- 5.5
- 5.6
- 5.7
- 5.8
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run tests
run: make test-linux SWIFT_VERSION=${{ matrix.swift }}

Expand All @@ -87,15 +82,10 @@ jobs:
steps:
- uses: compnerd/gha-setup-swift@main
with:
branch: swift-5.8.1-release
tag: 5.8.1-RELEASE
- uses: actions/checkout@v3
branch: swift-5.9.2-release
tag: 5.9.2-RELEASE
- uses: actions/checkout@v4
- name: Build All Configurations
run: swift build -c ${{ matrix.config }}
- name: Run tests (debug only)
# There is an issue that exists in the 5.8.1 toolchain
# which fails on release configuration testing, but
# this issue is fixed 5.9 so we can remove the if once
# that is generally available.
if: ${{ matrix.config == 'debug' }}
run: swift test
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.1
// swift-tools-version:5.7

import PackageDescription

Expand Down
36 changes: 0 additions & 36 deletions [email protected]

This file was deleted.

2 changes: 1 addition & 1 deletion Tests/CustomDumpTests/DumpTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ final class DumpTests: XCTestCase {

func testKeyPath() {
var dump = ""
#if swift(>=5.9)
#if swift(>=5.9) && (os(iOS) || os(macOS) || os(tvOS) || os(watchOS))
if #available(macOS 13.3, iOS 16.4, watchOS 9.4, tvOS 16.4, *) {
dump = ""
customDump(\UserClass.name, to: &dump)
Expand Down

0 comments on commit 707ee19

Please sign in to comment.