Skip to content

Commit ead7d30

Browse files
authored
Update CI to use latest Xcode, test in release (#68)
* Bump CI * wip * wip * wip * wip * Fix key path release bug * bump
1 parent 132a915 commit ead7d30

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
xcode:
1919
- '13.3.1'
2020
- '13.4.1'
21-
- '14.0'
21+
- '14.0.1'
22+
- '14.1'
2223
steps:
23-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2425
- name: Select Xcode ${{ matrix.xcode }}
2526
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
2627
- name: Print Swift version
@@ -38,9 +39,9 @@ jobs:
3839
swift:
3940
- 5.5
4041
- 5.6
41-
#- 5.7
42+
- 5.7
4243
steps:
43-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4445
- name: Run tests
4546
run: make test-linux SWIFT_VERSION=${{ matrix.swift }}
4647

@@ -50,12 +51,12 @@ jobs:
5051
strategy:
5152
matrix:
5253
include:
53-
- { toolchain: wasm-5.6.0-RELEASE }
54+
- { toolchain: wasm-5.7.1-RELEASE }
5455

5556
steps:
56-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v3
5758
- run: echo "${{ matrix.toolchain }}" > .swift-version
58-
- uses: swiftwasm/swiftwasm-action@v5.6
59+
- uses: swiftwasm/swiftwasm-action@v5.7
5960
with:
6061
shell-action: carton test --environment node
6162

@@ -65,8 +66,8 @@ jobs:
6566
# steps:
6667
# - uses: compnerd/gha-setup-swift@main
6768
# with:
68-
# branch: swift-5.5-release
69-
# tag: 5.5-RELEASE
69+
# branch: swift-5.7-release
70+
# tag: 5.7.1-RELEASE
7071
#
71-
# - uses: actions/checkout@v2
72+
# - uses: actions/checkout@v3
7273
# - run: swift test && swift build --configuration release

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ test-linux:
1616
-v "$(PWD):$(PWD)" \
1717
-w "$(PWD)" \
1818
swift:$(SWIFT_VERSION) \
19-
bash -c 'make test-swift SWIFT_VERSION=$(SWIFT_VERSION)'
19+
bash -c 'apt-get update && apt-get -y install make && make test-swift SWIFT_VERSION=$(SWIFT_VERSION)'
2020

2121
test-swift:
2222
swift test $(SWIFT_BUILD_ARGS) $(SWIFT_TEST_ARGS)
23-
swift build --configuration release $(SWIFT_BUILD_ARGS)
23+
swift test --configuration release $(SWIFT_BUILD_ARGS) $(SWIFT_TEST_ARGS)
2424

2525
test-platforms:
2626
xcodebuild test \
2727
-workspace CustomDump.xcworkspace \
2828
-scheme CustomDump \
2929
-destination platform="$(PLATFORM_IOS)"
30-
xcodebuild \
30+
xcodebuild test \
3131
-workspace CustomDump.xcworkspace \
3232
-scheme CustomDump \
3333
-configuration Release \
@@ -47,7 +47,7 @@ test-platforms:
4747
-workspace CustomDump.xcworkspace \
4848
-scheme CustomDump \
4949
-destination platform="$(PLATFORM_MAC_CATALYST)"
50-
xcodebuild \
50+
xcodebuild test \
5151
-workspace CustomDump.xcworkspace \
5252
-scheme CustomDump \
5353
-configuration Release \
@@ -57,7 +57,7 @@ test-platforms:
5757
-workspace CustomDump.xcworkspace \
5858
-scheme CustomDump \
5959
-destination platform="$(PLATFORM_TVOS)"
60-
xcodebuild \
60+
xcodebuild test \
6161
-workspace CustomDump.xcworkspace \
6262
-scheme CustomDump \
6363
-configuration Release \

Sources/CustomDump/Conformances/KeyPath.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@
802802
instantiateKeyPathBuffer(root, leaf, $0)
803803
}
804804

805-
let heapObj = UnsafeRawPointer(Unmanaged.passUnretained(instance).toOpaque())
805+
let heapObj = UnsafeRawPointer(Unmanaged.passRetained(instance).autorelease().toOpaque())
806806
let keyPath = unsafeBitCast(heapObj, to: AnyKeyPath.self)
807807
return keyPath
808808
}

Tests/CustomDumpTests/XCTAssertNoDifferenceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import XCTest
33

44
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6, *)
55
class XCTAssertNoDifferenceTests: XCTestCase {
6-
#if compiler(>=5.4) && (os(iOS) || os(macOS) || os(tvOS) || os(watchOS))
6+
#if DEBUG && compiler(>=5.4) && (os(iOS) || os(macOS) || os(tvOS) || os(watchOS))
77
func testXCTAssertNoDifference() {
88
XCTExpectFailure()
99

0 commit comments

Comments
 (0)