-
-
Notifications
You must be signed in to change notification settings - Fork 62
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Target using SCM should be indempotent #1170
Merged
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
Signed-off-by: Olblak <me@olblak.com>
Signed-off-by: Olblak <me@olblak.com>
olblak
changed the title
Target should push branch if left over changes
Target using SCM should be indempotent
Feb 19, 2023
Signed-off-by: Olblak <me@olblak.com>
Signed-off-by: Olblak <me@olblak.com>
Signed-off-by: Olblak <me@olblak.com>
After additional thought, this #1133 should be fixed by removing the reset operation done during the git checkout |
Remove early exit check Signed-off-by: Olblak <me@olblak.com>
Signed-off-by: Olblak <me@olblak.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Requirement
git
scm withpush=false
only the last target is left committed #1133Description
Fix #1162
At the moment the target execution combined with scm is not idempotent.
Running first
updatecli apply --config manifest --push=false
will clone the repository, update the files, but not publish the changes, as--push=false
is specified.If we run a second time the same command without
--push=false
, Updatecli will not change any files as local files are already up to date and won't push the changes as nothing change in the current pipeline execution.They are a few workaround which must result in deleting the local directory.
I propose in this pullrequest to check for each target execution if the current working branch such as
updatecli_xxx
has the same commit hash than the source branch such asmain
and if the remote ofupdatecli_xxx
exist.The goal is to identify if the current working breach has left over changes that need to be publish
Test
To test this pull request, you can run the following commands:
Additional Information
Tradeoff
Potential improvement