Wipe checkout directory on git checkout and git fetch failure and retry
#2137
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
triarius
force-pushed
the
pdp-1070-clean-up-checkout-dir-when-git-fetch-fails
branch
4 times, most recently
from
6e3ca39 to
6bbd748
Compare
triarius
changed the title
git fetch failure and retrygit checkout and git fetch failure and retry
triarius
commented
Jun 4, 2023
| if b.Config.Repository == "" { | ||
| b.shell.Commentf("Skipping checkout, BUILDKITE_REPO is empty") | ||
| break | ||
| } |
There was a problem hiding this comment.
This used to be on 1197. I've inverted the condition to decrease the indentation.
triarius
force-pushed
the
pdp-1070-clean-up-checkout-dir-when-git-fetch-fails
branch
from
6bbd748 to
03edbe9
Compare
DrJosh9000
approved these changes
Jun 5, 2023
| @@ -211,19 +213,19 @@ func (b *BootstrapTester) writeHookScript(m *bintest.Mock, name string, dir stri | |||
| body = "#!/bin/sh\n" + strings.Join(append([]string{m.Path}, args...), " ") | |||
| } | |||
|
|
|||
| if err := os.MkdirAll(dir, 0700); err != nil { | |||
| if err := os.MkdirAll(dir, 0o700); err != nil { | |||
Co-authored-by: Josh Deprez <[email protected]>
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.
There are a certain class of errors from git in the
defaultCheckoutPhasethat would cause a retry, but before the retry, the checkout directory would be removed. This allows cleaning up in case an unclean exit from git had left the checkout directory in an unrecoverable state.This PR adds failures in
git fetchandgit checkoutwhen the exit code is 128 to that class of error. It also fixes the detection of errors for which the check directory needed to be clean, as previously, the detection would fail if the errors were wrapped, and they are wrapped in thedefaultCheckoutPhasemethod.I've done some refactoring to reduce the indentation level of the code, so I recommend reviewing with whitespace changes hidden.