Use dry runs to avoid destroying data in release repos #45263
Conversation
migration-tools/migrate-rosdistro.py
Outdated
| subprocess.check_call(['git', 'push', 'origin', '--tags', '--dry-run']) | ||
| subprocess.check_call(['git', 'push', 'origin', 'upstream', '--force']) | ||
| subprocess.check_call(['git', 'push', 'origin', '--all', '--dry-run']) | ||
| subprocess.check_call(['git', 'push', 'origin', '--tags', '--all']) |
There was a problem hiding this comment.
This needs to be split since --all and --tags can't both be used. There's a synonym --branches for --all that may be easier to read.
migration-tools/migrate-rosdistro.py
Outdated
| # 3. Ensure we're not overwriting any branches | ||
| # 4. Push the branches and tags | ||
| subprocess.check_call(['git', 'push', 'origin', '--tags', '--dry-run']) | ||
| subprocess.check_call(['git', 'push', 'origin', 'upstream', '--force']) |
There was a problem hiding this comment.
There are situations where upstream/* tags may also technically be changed between releases which would result in an inconsistent state between the current upstream state and the previous tag but the only real-world examples I know of were in the early ROS 2 days with fastrtps and thankfully it doesn't happen any more.
There was a problem hiding this comment.
I don't think this requires action right away. It's a hint in case this change creates additional unexpected failures pushing other upstream tags.
nuclearsandwich
left a comment
nuclearsandwich
left a comment
There was a problem hiding this comment.
Left a suggestion which I'm pretty sure is a required change and clarified that the other comment is an observation rather than something actionable.
migration-tools/migrate-rosdistro.py
Outdated
| subprocess.check_call(['git', 'push', 'origin', '--tags', '--dry-run']) | ||
| subprocess.check_call(['git', 'push', 'origin', 'upstream', '--force']) | ||
| subprocess.check_call(['git', 'push', 'origin', '--all', '--dry-run']) | ||
| subprocess.check_call(['git', 'push', 'origin', '--tags', '--all']) |
There was a problem hiding this comment.
Putting my observation into suggestion.
| subprocess.check_call(['git', 'push', 'origin', '--tags', '--all']) | |
| subprocess.check_call(['git', 'push', 'origin', '--tags']) | |
| subprocess.check_call(['git', 'push', 'origin', '--branches']) |
cottsay
force-pushed
the
cottsay/migration-dry-runs
branch
from
cc70677 to
c8052d9
Compare
emersonknapp
added
the
persistent
3 participants
If something goes wrong, use dry run pushes to ensure we don't destroy any data in the repository.
upstreambranch. This is the ONLY branch we should ever force-push, and is an intermediate staging branch anyway.!!! I haven't actually tested this yet