Skip to content

Conversation

@grynspan
Copy link
Contributor

@grynspan grynspan commented Aug 22, 2024

This PR updates the version reported when using CMake (i.e. when building in the toolchain) to "6.1-dev" with optional trailing git commit hash, if available. The resulting string looks like:

6.1.0-dev (c6450e02cc76cd7 - modified)

"c6450e02cc76cd7" in this example refers to the most recent commit on the branch I was testing on via git rev-parse --verify HEAD, 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.)

Checklist:

  • Code and documentation should follow the style of the Style Guide.
  • If public symbols are renamed or modified, DocC references should be updated.

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.)
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan grynspan changed the title Set the library version reported via CMake to 6.1.0-dev. Set the library version reported via CMake to 6.1-dev. Aug 22, 2024
@briancroom
Copy link
Contributor

I’m not a qualified CMake reviewer, but looks fine to me if it’s working!

@grynspan
Copy link
Contributor Author

Seems to be working! As far as I can tell, the toolchain build succeeded (insofar as Swift Testing is involved—there were unrelated failures later.)

@grynspan grynspan merged commit a907113 into main Aug 23, 2024
@grynspan grynspan deleted the jgrynspan/cmake-version branch August 23, 2024 20:25
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
**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
@grynspan grynspan added this to the Swift 6.1 milestone Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build 🧱 Affects the project's build configuration or process

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants