[6.0] Set the library version reported via CMake to 6.0.#638
Merged
grynspan merged 3 commits intorelease/6.0from Aug 23, 2024
Merged
[6.0] Set the library version reported via CMake to 6.0.#638grynspan merged 3 commits intorelease/6.0from
grynspan merged 3 commits intorelease/6.0from
Conversation
This PR updates the version reported when using CMake (i.e. when building in the toolchain) to 6.1.0-dev with optional trailing git status information, if available. The resulting string looks like: > 6.1.0-dev (0.0.0-initial-532-gd01c406 - modified) "0.0.0-initial-532-gd01c406" in this example refers to the most recent commit on the branch I was testing on via `git describe --tags`, and "modified" is present because I had uncommitted changes. (We'll want to double-check that CMake used in CI can see the git repository and has access to the git tool.)
Contributor
Author
|
@swift-ci test |
compnerd
approved these changes
Aug 22, 2024
| OUTPUT_VARIABLE GIT_STATUS | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| if(GIT_STATUS) | ||
| set(GIT_VERSION "${GIT_VERSION} - modified") |
Member
There was a problem hiding this comment.
I've usually seen the suffix -dirty for this purpose.
Member
There was a problem hiding this comment.
Okay, that's reasonable, different places have different sensitivities to that. Let's stick with what you have.
1e145c8 to
2bf0461
Compare
Contributor
Author
|
@swift-ci test |
briancroom
approved these changes
Aug 23, 2024
grynspan
added a commit
that referenced
this pull request
Aug 23, 2024
**Explanation:** Sets the version of the library as built in CMake to "6.0". **Scope:** 6.0 releases built with CMake instead of SwiftPM **Issue:** N/A **Original PR:** #637 **Risk:** Low **Testing:** Manually tested at desk and in a toolchain build as we don't have CI jobs using CMake yet. See swiftlang/swift#76034 **Reviewer:** @compnerd @briancroom
grynspan
added a commit
that referenced
this pull request
Aug 23, 2024
**Explanation:** Sets the version of the library as built in CMake to "6.0". **Scope:** 6.0 releases built with CMake instead of SwiftPM **Issue:** N/A **Original PR:** #637, #638 **Risk:** Low **Testing:** Manually tested at desk and in a toolchain build as we don't have CI jobs using CMake yet. See swiftlang/swift#76034 **Reviewer:** @compnerd @briancroom
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Explanation: Sets the version of the library as built in CMake to "6.0".
Scope: 6.0 releases built with CMake instead of SwiftPM
Issue: N/A
Original PR: #637
Risk: Low
Testing: Manually tested at desk and in a toolchain build as we don't have CI jobs using CMake yet. See swiftlang/swift#76034
Reviewer: @compnerd @briancroom