Skip to content

Commit 5300249

Browse files
authored
Remove explicit test manifest for Linux now that discovery is default in Swift 5.4+ (#28)
1 parent 7954cc6 commit 5300249

File tree

4 files changed

+31
-90
lines changed

4 files changed

+31
-90
lines changed

.circleci/config.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,18 @@ jobs:
116116
path: artifacts
117117

118118
build_linux:
119+
parameters:
120+
docker-image:
121+
type: string
122+
discover-tests:
123+
description: Whether to use explicit test discovery with SwiftPM
124+
type: boolean
125+
default: false
126+
119127
shell: /bin/bash --login -eo pipefail
120128

121129
docker:
122-
- image: norionomura/swift:latest
130+
- image: <<parameters.docker-image>>
123131

124132
steps:
125133
- checkout
@@ -129,8 +137,13 @@ jobs:
129137
command: mkdir -p 'artifacts'
130138

131139
- run:
132-
name: Build & Test with swiftpm
133-
command: swift test -v | tee 'artifacts/raw-logs-swiftpm-linux.txt'
140+
name: >-
141+
Build & Test with SwiftPM
142+
<<# parameters.discover-tests >>using explicit test discovery<</ parameters.discover-tests >>
143+
command: >-
144+
swift test -v
145+
<<# parameters.discover-tests >> --enable-test-discovery <</ parameters.discover-tests >>
146+
| tee 'artifacts/raw-logs-swiftpm-linux.txt'
134147
135148
- store_artifacts:
136149
path: artifacts
@@ -161,5 +174,19 @@ workflows:
161174
name: Xcode 11.0 - Swift 5.1
162175
xcode-version: '11.0.0'
163176
ios-sim: 'platform=iOS Simulator,name=iPhone 8,OS=12.2'
164-
- build_linux
177+
- build_linux:
178+
name: Linux - Swift 5.4
179+
docker-image: norionomura/swift:5.4
180+
- build_linux:
181+
name: Linux - Swift 5.3
182+
docker-image: norionomura/swift:5.3
183+
discover-tests: true
184+
- build_linux:
185+
name: Linux - Swift 5.2
186+
docker-image: norionomura/swift:5.2
187+
discover-tests: true
188+
- build_linux:
189+
name: Linux - Swift 5.1
190+
docker-image: norionomura/swift:5.1
191+
discover-tests: true
165192
- build_macos_universal

LDSwiftEventSource.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
B49B5E4C24667F62008BF867 /* EventParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49B5E4624667F43008BF867 /* EventParser.swift */; };
1313
B49B5E4D24667F62008BF867 /* LDSwiftEventSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49B5E4724667F43008BF867 /* LDSwiftEventSource.swift */; };
1414
B49B5E5824668031008BF867 /* EventParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49B5E4024667F43008BF867 /* EventParserTests.swift */; };
15-
B49B5E5924668031008BF867 /* XCTestManifests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49B5E4124667F43008BF867 /* XCTestManifests.swift */; };
1615
B49B5E5A24668031008BF867 /* UTF8LineParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49B5E4224667F43008BF867 /* UTF8LineParserTests.swift */; };
1716
B49B5E5B24668031008BF867 /* LDSwiftEventSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49B5E4324667F43008BF867 /* LDSwiftEventSourceTests.swift */; };
1817
B49B5E67246684B9008BF867 /* LDSwiftEventSource.h in Headers */ = {isa = PBXBuildFile; fileRef = B49B5E65246684B9008BF867 /* LDSwiftEventSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -36,7 +35,6 @@
3635
B49B5DFC24667D41008BF867 /* LDSwiftEventSource.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LDSwiftEventSource.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3736
B49B5E0424667D42008BF867 /* LDSwiftEventSource Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "LDSwiftEventSource Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
3837
B49B5E4024667F43008BF867 /* EventParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventParserTests.swift; sourceTree = "<group>"; };
39-
B49B5E4124667F43008BF867 /* XCTestManifests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCTestManifests.swift; sourceTree = "<group>"; };
4038
B49B5E4224667F43008BF867 /* UTF8LineParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTF8LineParserTests.swift; sourceTree = "<group>"; };
4139
B49B5E4324667F43008BF867 /* LDSwiftEventSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LDSwiftEventSourceTests.swift; sourceTree = "<group>"; };
4240
B49B5E4524667F43008BF867 /* UTF8LineParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTF8LineParser.swift; sourceTree = "<group>"; };
@@ -94,7 +92,6 @@
9492
isa = PBXGroup;
9593
children = (
9694
B49B5E4024667F43008BF867 /* EventParserTests.swift */,
97-
B49B5E4124667F43008BF867 /* XCTestManifests.swift */,
9895
B49B5E4224667F43008BF867 /* UTF8LineParserTests.swift */,
9996
B49B5E4324667F43008BF867 /* LDSwiftEventSourceTests.swift */,
10097
);
@@ -273,7 +270,6 @@
273270
buildActionMask = 2147483647;
274271
files = (
275272
B49B5E5824668031008BF867 /* EventParserTests.swift in Sources */,
276-
B49B5E5924668031008BF867 /* XCTestManifests.swift in Sources */,
277273
B49B5E5A24668031008BF867 /* UTF8LineParserTests.swift in Sources */,
278274
B49B5E5B24668031008BF867 /* LDSwiftEventSourceTests.swift in Sources */,
279275
);

LinuxMain.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

Tests/XCTestManifests.swift

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)