Actually fail CI when tests fail #313
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,131 +21,75 @@ enum TaskError: Error { | |
| } | ||
|
|
||
| enum Platform: String, CustomStringConvertible { | ||
| case iOS_15 | ||
| case iOS_16 | ||
| case iOS_17 | ||
| case tvOS_15 | ||
| case tvOS_16 | ||
| case tvOS_17 | ||
| case macOS_12 | ||
| case macOS_13 | ||
| case macOS_14 | ||
| case watchOS_8 | ||
| case watchOS_9 | ||
| case watchOS_10 | ||
|
|
||
| var destination: String { | ||
| switch self { | ||
| case .iOS_15: | ||
| return "platform=iOS Simulator,OS=15.5,name=iPad Pro (12.9-inch) (5th generation)" | ||
| case .iOS_16: | ||
| return "platform=iOS Simulator,OS=16.4,name=iPad Pro (12.9-inch) (6th generation)" | ||
| case .iOS_17: | ||
| return "platform=iOS Simulator,OS=17.4,name=iPad Pro (12.9-inch) (6th generation)" | ||
|
|
||
| case .tvOS_15: | ||
| return "platform=tvOS Simulator,OS=15.4,name=Apple TV" | ||
| case .tvOS_16: | ||
| return "platform=tvOS Simulator,OS=16.4,name=Apple TV" | ||
| case .tvOS_17: | ||
| return "platform=tvOS Simulator,OS=17.4,name=Apple TV" | ||
|
|
||
| case .macOS_12, | ||
| .macOS_13, | ||
| .macOS_14: | ||
| return "platform=OS X" | ||
|
|
||
| case .watchOS_8: | ||
| return "OS=8.5,name=Apple Watch Series 6 - 44mm" | ||
| case .watchOS_9: | ||
| return "OS=9.4,name=Apple Watch Series 6 (44mm)" | ||
| case .watchOS_10: | ||
| return "OS=10.4,name=Apple Watch Series 9 (45mm)" | ||
| } | ||
| } | ||
|
|
||
| var sdk: String { | ||
| switch self { | ||
| case .iOS_15, | ||
| .iOS_16, | ||
| .iOS_17: | ||
| return "iphonesimulator" | ||
|
|
||
| case .tvOS_15, | ||
| .tvOS_16, | ||
| .tvOS_17: | ||
| return "appletvsimulator" | ||
|
|
||
| case .macOS_12: | ||
| return "macosx12.3" | ||
| case .macOS_13: | ||
| return "macosx13.3" | ||
| case .macOS_14: | ||
| return "macosx14.4" | ||
|
|
||
| case .watchOS_8, | ||
| .watchOS_9, | ||
| .watchOS_10: | ||
| return "watchsimulator" | ||
| } | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. well this is nice at least! always |
||
| /// Whether the platform's Xcode version requires modern SPM integration in xcodebuild, given the removal of generate-xcodeproj. | ||
| var requiresModernSPMIntegration: Bool { | ||
| switch self { | ||
|
|
@@ -163,29 +107,22 @@ enum Platform: String, CustomStringConvertible { | |
|
|
||
| var scheme: String { | ||
| switch self { | ||
| case .iOS_15, | ||
| .iOS_16, | ||
| .iOS_17: | ||
| return "Valet iOS" | ||
|
|
||
| case .tvOS_15, | ||
| .tvOS_16, | ||
| .tvOS_17: | ||
| return "Valet tvOS" | ||
|
|
||
| case .macOS_12, | ||
| .macOS_13, | ||
| .macOS_14: | ||
| return "Valet Mac" | ||
|
|
||
| case .watchOS_8, | ||
| .watchOS_9, | ||
| .watchOS_10: | ||
| return "Valet watchOS" | ||
|
|
@@ -271,27 +208,27 @@ enum Task: String, CustomStringConvertible { | |
| // Our Package isn't set up with unit test targets, because SPM can't run unit tests in a codesigned environment. | ||
| return false | ||
| case .xcode: | ||
| return true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| guard CommandLine.arguments.count > 2 else { | ||
| print("Usage: build.swift platforms [spm|xcode]") | ||
| throw TaskError.code(1) | ||
|
Comment on lines
-281
to
+218
There was a problem hiding this comment. From #300. Reverting so we can catch errors. |
||
| } | ||
| let rawPlatforms = CommandLine.arguments[1].components(separatedBy: ",") | ||
| let rawTask = CommandLine.arguments[2] | ||
|
|
||
| guard let task = Task(rawValue: rawTask) else { | ||
| print("Received unknown task \(rawTask)") | ||
| throw TaskError.code(1) | ||
| } | ||
|
|
||
| let platforms = try rawPlatforms.map { rawPlatform -> Platform in | ||
| guard let platform = Platform(rawValue: rawPlatform) else { | ||
| print("Received unknown platform type \(rawPlatform)") | ||
| throw TaskError.code(1) | ||
| } | ||
|
|
||
| return platform | ||
|
|
@@ -315,7 +252,7 @@ for platform in platforms { | |
| deletedXcodeproj = true | ||
| } catch { | ||
| print("Could not delete Valet.xcodeproj due to error: \(error)") | ||
| throw TaskError.code(1) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -349,11 +286,7 @@ for platform in platforms { | |
| xcodeBuildArguments.append("test") | ||
| } | ||
|
|
||
| try execute(commandPath: "/usr/bin/xcodebuild", arguments: xcodeBuildArguments) | ||
|
Comment on lines
-352
to
+289
There was a problem hiding this comment. From #300. This was the big bad. |
||
|
|
||
| if deletedXcodeproj { | ||
| do { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well I broke Xcode 12 in addition to Xcode 11 builds in #308. Not ideal, but for the same reason we let #308 through, we're okay letting this change through.
Latest supported Xcode is 14. It'll be 15 on Friday.