Skip to content

Commit f01efb2

Browse files
authored
Improve object diffing tools (#111)
* wip * wip * wip * wip * wip * wip * wip * wip * fix * Swift 5.7 fix * wip * wip * wip * wip * wip * wip * wip * wip * wip
1 parent 3e905e7 commit f01efb2

File tree

10 files changed

+694
-1209
lines changed

10 files changed

+694
-1209
lines changed

.github/workflows/ci.yml

+15-30
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,35 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
jobs:
17-
macos-13:
18-
name: macOS 13 (Xcode ${{ matrix.xcode }})
17+
macos-14:
18+
name: macOS 14 (Xcode ${{ matrix.xcode }})
1919
runs-on: macOS-13
2020
strategy:
2121
matrix:
2222
xcode:
23-
- '14.3.1'
23+
- '15.2'
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
- name: Select Xcode ${{ matrix.xcode }}
2727
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
2828
- name: Print Swift version
2929
run: swift --version
30-
- name: Run tests (Swift)
31-
run: make test-swift
3230
- name: Run tests (platforms)
3331
run: make test-platforms
3432

35-
macos-12:
36-
name: macOS 12 (Xcode ${{ matrix.xcode }})
37-
runs-on: macOS-12
33+
macos-13:
34+
name: macOS 13 (Xcode ${{ matrix.xcode }})
35+
runs-on: macOS-13
3836
strategy:
3937
matrix:
4038
xcode:
41-
- '13.3.1'
42-
- '13.4.1'
43-
- '14.0.1'
44-
- '14.1'
39+
- '14.3.1'
4540
steps:
46-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4742
- name: Select Xcode ${{ matrix.xcode }}
4843
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
4944
- name: Print Swift version
5045
run: swift --version
51-
- name: Run tests (Swift)
52-
run: make test-swift
5346
- name: Run tests (platforms)
5447
run: make test-platforms
5548

@@ -59,20 +52,17 @@ jobs:
5952
strategy:
6053
matrix:
6154
swift:
62-
- 5.5
63-
- 5.6
64-
- 5.7
65-
- 5.8
55+
- '5.10'
6656
steps:
67-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
6858
- name: Run tests
6959
run: make test-linux SWIFT_VERSION=${{ matrix.swift }}
7060

7161
wasm:
7262
name: SwiftWasm
7363
runs-on: ubuntu-latest
7464
steps:
75-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
7666
- uses: bytecodealliance/actions/wasmtime/setup@v1
7767
- uses: swiftwasm/setup-swiftwasm@v1
7868
with:
@@ -92,15 +82,10 @@ jobs:
9282
steps:
9383
- uses: compnerd/gha-setup-swift@main
9484
with:
95-
branch: swift-5.8.1-release
96-
tag: 5.8.1-RELEASE
97-
- uses: actions/checkout@v3
85+
branch: swift-5.10-release
86+
tag: 5.10-RELEASE
87+
- uses: actions/checkout@v4
9888
- name: Build All Configurations
9989
run: swift build -c ${{ matrix.config }}
10090
- name: Run tests (debug only)
101-
# There is an issue that exists in the 5.8.1 toolchain
102-
# which fails on release configuration testing, but
103-
# this issue is fixed 5.9 so we can remove the if once
104-
# that is generally available.
105-
if: ${{ matrix.config == 'debug' }}
10691
run: swift test

Makefile

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
22
PLATFORM_MACOS = macOS
33
PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
44
PLATFORM_TVOS = tvOS Simulator,name=Apple TV
5-
SWIFT_VERSION = 5.5
6-
ifeq ($(SWIFT_VERSION),5.3)
7-
SWIFT_BUILD_ARGS = --enable-test-discovery
8-
endif
5+
SWIFT_VERSION = 5.7
96
SWIFT_TEST_ARGS = --parallel
107

118
test-all: test-linux test-swift test-platforms
@@ -19,8 +16,8 @@ test-linux:
1916
bash -c 'apt-get update && apt-get -y install make && make test-swift SWIFT_VERSION=$(SWIFT_VERSION)'
2017

2118
test-swift:
22-
swift test $(SWIFT_BUILD_ARGS) $(SWIFT_TEST_ARGS)
23-
swift test --configuration release $(SWIFT_BUILD_ARGS) $(SWIFT_TEST_ARGS)
19+
swift test $(SWIFT_TEST_ARGS)
20+
swift test --configuration release $(SWIFT_TEST_ARGS)
2421

2522
test-platforms:
2623
xcodebuild test \

Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:5.7
22

33
import PackageDescription
44

[email protected]

-36
This file was deleted.

0 commit comments

Comments
 (0)