Fix logic to update version when HEAD changes. #10896
Merged
Conversation
This file contains 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
Fixes helix-editor#10855. The loader build.rs tries to determine when HEAD changes, so it can re-run and update the embedded version. It was shelling out to do this, and capturing a trailing newline, so it always thought HEAD did not exist. I confirmed that if I update helix-term, helix-loader rebuilds and updates the commit hash: ``` [rcorre@midgar helix]$ git rev-parse --short HEAD e24eed2c [rcorre@midgar helix]$ hx --version helix 24.3 (e24eed2c) [rcorre@midgar helix]$ hx helix-term/src/main.rs [rcorre@midgar helix]$ git cma "test changing helix-term" [fix-version cbb68bab] test changing helix-term 1 file changed, 1 insertion(+) [rcorre@midgar helix]$ cargo install --path helix-term --locked Installing helix-term v24.3.0 (/home/rcorre/src/helix/helix-term) Updating crates.io index Compiling helix-loader v24.3.0 (/home/rcorre/src/helix/helix-loader) Compiling helix-term v24.3.0 (/home/rcorre/src/helix/helix-term) ... snip ... [rcorre@midgar helix]$ git rev-parse --short HEAD cbb68bab [rcorre@midgar helix]$ hx --version helix 24.3 (cbb68bab) ```
pascalkuthe
approved these changes
Jun 6, 2024
archseer
approved these changes
Jun 6, 2024
Vulpesx
pushed a commit
to Vulpesx/helix
that referenced
this pull request
Jun 7, 2024
AOx0
pushed a commit
to AOx0/helix
that referenced
this pull request
Jun 15, 2024
smortime
pushed a commit
to smortime/helix
that referenced
this pull request
Jul 10, 2024
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.
Fixes #10855.
The loader build.rs tries to determine when HEAD changes,
so it can re-run and update the embedded version.
It was shelling out to do this, and capturing a trailing newline,
so it always thought HEAD did not exist.
I confirmed that if I update helix-term, helix-loader rebuilds and updates the commit hash: