Disable development mode

Disable development mode on the release.
swiftlang · Dec 13, 2024 · df93234 · df93234
1 parent cade736
commit df93234
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/Sources/Basics/SwiftVersion.swift b/Sources/Basics/SwiftVersion.swift
@@ -58,8 +58,8 @@ public struct SwiftVersion: Sendable {
 extension SwiftVersion {
     /// The current version of the package manager.
     public static let current = SwiftVersion(
-        version: (6, 2, 0),
-        isDevelopment: true,
+        version: (6, 1, 0),
+        isDevelopment: false,
         buildIdentifier: getBuildIdentifier()
     )
 }

diff --git a/Sources/PackageModel/ToolsVersion.swift b/Sources/PackageModel/ToolsVersion.swift
@@ -32,6 +32,7 @@ public struct ToolsVersion: Equatable, Hashable, Codable, Sendable {
     public static let v5_9 = ToolsVersion(version: "5.9.0")
     public static let v5_10 = ToolsVersion(version: "5.10.0")
     public static let v6_0 = ToolsVersion(version: "6.0.0")
+    public static let v6_1 = ToolsVersion(version: "6.1.0")
     public static let vNext = ToolsVersion(version: "999.0.0")
 
     /// The current tools version in use.

diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -206,7 +206,7 @@ final class WorkspaceTests: XCTestCase {
             do {
                 let ws = try createWorkspace(
                     """
-                    // swift-tools-version:999.0
+                    // swift-tools-version:5.10.0
                     import PackageDescription
                     let package = Package(
                         name: "foo"
@@ -228,7 +228,25 @@ final class WorkspaceTests: XCTestCase {
 
                 XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-package-description-version")])
             }
+
+            do {
+                let ws = try createWorkspace(
+                    """
+                    // swift-tools-version:999.0
+                    import PackageDescription
+                    let package = Package(
+                        name: "foo"
+                    )
+                    """
+                )
+
+                XCTAssertMatch(
+                    ws.interpreterFlags(for: foo),
+                    (SwiftVersion.current.isDevelopment) ? [.equal("-swift-version"), .equal("6")]: []
+                )
+            }
         }
+
     }
 
     func testManifestParseError() async throws {
@@ -4092,7 +4110,7 @@ final class WorkspaceTests: XCTestCase {
                         .sourceControl(url: "https://localhost/org/foo", requirement: .upToNextMajor(from: "1.0.0")),
                         .sourceControl(url: "https://localhost/org/bar", requirement: .upToNextMinor(from: "1.1.0"))
                     ],
-                    toolsVersion: .vNext // change to the one after 5.9
+                    toolsVersion: .v5_10
                 ),
             ],
             packages: [

diff --git a/Utilities/build-using-self b/Utilities/build-using-self
@@ -23,6 +23,9 @@ export SWIFTCI_IS_SELF_HOSTED=1
 
 set -x
 
+# Display toolchain version
+swift --version
+
 # Perform package update in order to get the latest commits for the dependencies.
 swift package update
 swift build -c $CONFIGURATION