Check to see if the repo is really dirty #3348
Closed
Conversation
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
Running `git status` in the .variables script shows 11 deleted files. I tried using `git update-index --assume-unchanged <deleted files>` but got an error that you can't do that on a readonly file system. If it's a readonly file system I don't know how those files got deleted, but here's a kludgy workaround. Verify that `git status -s` reports only those 11 deleted files. If so, strip the '.m' suffix off the VERSION variable. Signed-off-by: Eric Promislow <epromislow@suse.com>
Codecov Report
@@ Coverage Diff @@
## master #3348 +/- ##
=======================================
Coverage 58.01% 58.01%
=======================================
Files 302 302
Lines 21762 21762
=======================================
Hits 12625 12625
Misses 8215 8215
Partials 922 922 |
Author
|
#3349 looks like a better way to fix the problem. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #3347
- What I did
For whatever reason, some files are
git removedaccording to the container. If a particular set of files has been removed, and there aren't any other git changes, ignore the.msuffix on the version.- How I did it
I wrote a clunky awk script to make that check. I wanted to do something like
if diff -sw <(git status -s | sort) <(sort <<'EOT' list of files EOT ); then ...but the script is written to use the bourne shell, which doesn't support process substitution.
I didn't bother understanding why those 11 files are deleted, but not deleting them would obviously be a better fix, and presumably not require awk code.
- How to verify it
Apply a tag to the codebase. I used
git tag 20.10.10.Running
docker buildx bake && build/docker -vshould output20.10.10, not20.10.10.m- Description for the changelog
Avoid adding a .m suffix to the version field when there are no actual changes to the codebase.
- A picture of a cute animal (not mandatory but encouraged)