Preserve hack/test/kind/infra/operator directory#12175
Open
nelljerram wants to merge 1 commit intoprojectcalico:masterfrom
Open
Preserve hack/test/kind/infra/operator directory#12175nelljerram wants to merge 1 commit intoprojectcalico:masterfrom
nelljerram wants to merge 1 commit intoprojectcalico:masterfrom
Conversation
This directory is checked in but was being deleted by the clean target in node/Makefile:
rm -rf $(REPO_ROOT)/hack/test/kind/infra/operator
This might be the cause of the hashrelease build currently failing with
FATAL[0067]main.go:85 main.main() Error running app error="there are uncommitted changes in the repository, please commit or stash them before publishing the release"
I've reproduced a failing build with "sem debug" and then "git status" shows:
semaphore@semaphore-vm:~/calico/release$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: ../hack/test/kind/infra/operator
no changes added to commit (use "git add" and/or "git commit -a")
So it looks like the immediate problem in the hashrelease build is hack/test/kind/infra/operator
having been deleted. I don't know for sure if that is because of a make clean in node, but it seems
like a good guess.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts the node/Makefile clean target to ensure hack/test/kind/infra/operator exists after make clean, aiming to prevent release/hashrelease builds from seeing a dirty git working tree due to that path being removed.
Changes:
- After removing
$(REPO_ROOT)/hack/test/kind/infra/operatorduringmake clean, recreate the directory.
| rm -rf $(BUILD_DEPS) | ||
| rm -rf filesystem/included-source | ||
| rm -rf $(REPO_ROOT)/hack/test/kind/infra/operator | ||
| mkdir $(REPO_ROOT)/hack/test/kind/infra/operator |
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.
This directory is checked in but was being deleted by the clean target in node/Makefile:
This might be the cause of the hashrelease build currently failing with
I've reproduced a failing build with "sem debug" and then "git status" shows:
So it looks like the immediate problem in the hashrelease build is hack/test/kind/infra/operator having been deleted. I don't know for sure if that is because of a make clean in node, but it seems like a good guess.