CI: reset existing repo to known state #11880
Merged
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
smarter
force-pushed
the
fix-submodules-3
branch
6 times, most recently
from
d392a36
to
2d2acde
Compare
|
The slightly weird |
If at some point a PR accidentally deletes a git submodule without deleting it from .gitmodules, subsequent PRs using the same runner will fail because the checkout action will try to run `git submodule foreach ...` before updating the git repo to match the current PR and fail, we can avoid the problem by always resetting to origin/master which hopefully is always in a good state. The `-c "http.https://github.com/.extraheader="` resets a setting set by the checkout action which causes authentication issues when fetching. Ideally the checkout action would be more robust: actions/checkout#354
smarter
force-pushed
the
fix-submodules-3
branch
from
2d2acde
to
2d7b3fc
Compare
anatoliykmetyuk
approved these changes
Mar 24, 2021
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.
If at some point a PR accidentally deletes a git submodule without
deleting it from .gitmodules, subsequent PRs using the same runner will
fail because the checkout action will try to run
git submodule foreach ...before updating the git repo to match the current PR and fail, wecan avoid the problem by always resetting to origin/master which
hopefully is always in a good state.
Ideally the checkout action would be more robust: actions/checkout#354