build.sh: fix error-handling for make#2898
Merged
cgwalters merged 1 commit intocoreos:mainfrom Jun 2, 2022
Merged
Conversation
We have `errexit` in `build.sh`, but that has no effect on `make` here because it's part of a command list. Closes: coreos#2897
Member
Author
|
Bash intricacies strike again! |
Member
Author
|
Here's how I tested this: diff --git a/build.sh b/build.sh
index 992ead9cd..166f42707 100755
--- a/build.sh
+++ b/build.sh
@@ -101,11 +101,8 @@ install_ocp_tools() {
}
make_and_makeinstall() {
- make
- make install
- # Remove go build cache
- # https://github.com/coreos/coreos-assembler/issues/2872
- rm -rf /root/.cache/go-build
+ false && make install
+ true
}
configure_user(){ |
Member
Author
|
Hmm OK right, I think the issue is actually that we're not using |
cgwalters
approved these changes
Jun 2, 2022
Member
|
Thanks for looking at this @jlebon! |
Member
|
This should also fix #2884 |
Member
|
Eh, let's just force this in |
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.
We have
errexitinbuild.sh, but that has no effect onmakeherebecause it's part of a command list.
Closes: #2897