[CI]: small fixes #4199
Merged
[CI]: small fixes #4199
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
Signed-off-by: apostasie <[email protected]>
Signed-off-by: apostasie <[email protected]>
Signed-off-by: apostasie <[email protected]>
Signed-off-by: apostasie <[email protected]>
This was referenced May 6, 2025
AkihiroSuda
reviewed
May 7, 2025
| @@ -26,7 +26,7 @@ if [[ "$(id -u)" = "0" ]]; then | |||
| fi | |||
|
|
|||
| : "${WORKAROUND_ISSUE_622:=}" | |||
| if [[ "$WORKAROUND_ISSUE_622" = "1" ]]; then | |||
| if [[ "$WORKAROUND_ISSUE_622" != "" ]]; then | |||
There was a problem hiding this comment.
This breaks WORKAROUND_ISSUE_622=0 but I guess we do not need to keep compatibility for this workaround
AkihiroSuda
reviewed
May 7, 2025
| @@ -39,9 +39,9 @@ DOCDIR ?= $(DATADIR)/doc | |||
|
|
|||
| BINARY ?= "nerdctl" | |||
| MAKEFILE_DIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))) | |||
| VERSION ?= $(shell git -C $(MAKEFILE_DIR) describe --match 'v[0-9]*' --dirty='.m' --always --tags) | |||
| VERSION ?= $(shell git -C $(MAKEFILE_DIR) describe --match 'v[0-9]*' --dirty='.m' --always --tags 2>/dev/null || echo no_git_information) | |||
There was a problem hiding this comment.
Bikeshedding: an empty string should suffice for no_git_information
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.
This adds a few minor tweaks to the CI:
gitis missingin-containerCI jobThough unrelated to one another, these are small and minor.
Still LMK if you prefer this PR to be broken down in individual chunks.