Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable SwiftVersion development mode #8074

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Disable SwiftVersion development mode #8074

merged 1 commit into from
Nov 1, 2024

Conversation

bkhouri
Copy link
Contributor

@bkhouri bkhouri commented Oct 24, 2024

Motivation:

Running swift package --version indicate it is in development mode, while swift --release does not.

❯ swift --version  
Apple Swift version 6.0.1 (swift-6.0.1-RELEASE)
Target: arm64-apple-macosx15.0

❯ swift package --version
Swift Package Manager - Swift 6.0.1-dev

Modifications:

Toggling isDevelopment boolean to false in SwiftVersion struct extension.

Result:

❯ swift build --show-bin-path
/Users/bkhouri/Documents/git/public/swiftlang/swift-package-manager/.build/arm64-apple-macosx/debug

❯ /Users/bkhouri/Documents/git/public/swiftlang/swift-package-manager/.build/arm64-apple-macosx/debug/swift-package --version
Swift Package Manager - Swift 6.0.2

@bkhouri bkhouri requested a review from a team as a code owner October 24, 2024 20:00
@shahmishal
Copy link
Member

Please create a pull request on release/6.0 branch. Also, we are not accepting any more changes to release/6.0.2 branch.

@bkhouri bkhouri changed the base branch from release/6.0.2 to release/6.0.0 October 24, 2024 23:45
@bkhouri bkhouri changed the base branch from release/6.0.0 to release/6.0 October 24, 2024 23:45
@bkhouri bkhouri force-pushed the t/release/602/bkhouri_version_to_production branch from 06a0b55 to 09b8a4e Compare October 24, 2024 23:47
@bnbarham
Copy link
Contributor

@swift-ci please test

@bkhouri bkhouri force-pushed the t/release/602/bkhouri_version_to_production branch from 09b8a4e to 5aebb5f Compare October 29, 2024 00:56
@bnbarham
Copy link
Contributor

@swift-ci please test

bkhouri
bkhouri commented Oct 29, 2024
View reviewed changes
Tests/WorkspaceTests/WorkspaceTests.swift
XCTAssertMatch(ws.interpreterFlags(for: foo), [.equal("-swift-version"), .equal("6")])
XCTAssertMatch(
ws.interpreterFlags(for: foo),
(SwiftVersion.current.isDevelopment) ? [.equal("-swift-version"), .equal("6")] : []
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: instead of setting the expected value based on SwiftVersion.current.isDevelopment, should we instead modify line 208 to use a specific // swift-tools-version:5.10, or whichever version it's supposed to be?

@bnbarham
Copy link
Contributor

@swift-ci please test Windows platform

@daveyc123 daveyc123 merged commit bc68941 into swiftlang:release/6.0 Nov 1, 2024
5 checks passed
@bkhouri bkhouri deleted the t/release/602/bkhouri_version_to_production branch November 1, 2024 14:04
@bkhouri bkhouri mentioned this pull request Dec 20, 2024
Merged
bkhouri added a commit that referenced this pull request Dec 20, 2024
@bkhouri
Tool version updates (#8183)
307316d 
Update the `ToolsVersion` data structure to include the 6.1.0 release,
and update some references to ToolsVersion.vNext and 999.0 to
non-development releases.


References:
- #8139
- #8074
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daveyc123 daveyc123 daveyc123 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bkhouri @shahmishal @bnbarham @daveyc123