Skip to content

Commit ad4ffe4

Browse files
authored
Disable development mode for 5.9 branch (#6474)
Also tweak some tests that were either errorneously using 999.0 as their tools-version or those which require it.
1 parent 23880d9 commit ad4ffe4

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

Fixtures/Miscellaneous/CXX17CompilerCrash/v5_8/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:999.0.0
1+
// swift-tools-version:5.8.0
22

33
import PackageDescription
44

Fixtures/Miscellaneous/Plugins/PluginsAndSnippets/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 999.0
1+
// swift-tools-version: 5.9
22
import PackageDescription
33

44
let package = Package(

Sources/Basics/SwiftVersion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extension SwiftVersion {
5555
/// The current version of the package manager.
5656
public static let current = SwiftVersion(
5757
version: (5, 9, 0),
58-
isDevelopment: true,
58+
isDevelopment: false,
5959
buildIdentifier: getBuildIdentifier()
6060
)
6161
}

Tests/BuildTests/BuildPlanTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ final class BuildPlanTests: XCTestCase {
537537
}
538538

539539
func testPackageNameFlag() throws {
540+
try XCTSkipIf(!SwiftVersion.current.isDevelopment, "test needs tools-version 999.0")
540541
let isFlagSupportedInDriver = try driverSupport.checkToolchainDriverFlags(flags: ["package-name"], toolchain: UserToolchain.default, fileSystem: localFileSystem)
541542
try fixture(name: "Miscellaneous/PackageNameFlag") { fixturePath in
542543
let (stdout, _) = try executeSwiftBuild(fixturePath.appending("appPkg"), extraArgs: ["-v"])
@@ -559,6 +560,7 @@ final class BuildPlanTests: XCTestCase {
559560
}
560561

561562
func testTargetGroupToPackageNameFlag() throws {
563+
try XCTSkipIf(!SwiftVersion.current.isDevelopment, "test needs tools-version 999.0")
562564
let isFlagSupportedInDriver = try driverSupport.checkToolchainDriverFlags(flags: ["package-name"], toolchain: UserToolchain.default, fileSystem: localFileSystem)
563565
try fixture(name: "Miscellaneous/TargetGrouping") { fixturePath in
564566
let (stdout, _) = try executeSwiftBuild(fixturePath.appending("libPkg"), extraArgs: ["-v"])

0 commit comments

Comments
 (0)