Skip to content

[Release] Improve post-11-bump-versions.sh to avoid possible stray commits to reaching main #36048

@raulcd

Description

@raulcd

Describe the enhancement requested

In the post-11-bump-versions.sh we push directly to main. I already created an issue in the past that I thought we could modify it to not push: #33931

For the 12.0.1 patch release I accidentally had some issues when executing the script due to the Debian package versions failing to be updated. It was successful when I used: BUMP_DEB_PACKAGE_NAMES=0
When it finally executed correctly it pushed a lot of testing commits I had done locally to understand what the issue was plus some stray commits from previous executions as seen here:
f08670b...e53db93

As seen on those commits I pushed a new commit reverting the bad ones.

In order to avoid this from happening in the future we could:

  • Validate when executing the script that local history does not differ from upstream. There are no stray commits.
  • Do not push directly but show the command and prompt to push, asking the user to validate history before pushing.

Component(s)

Developer Tools, Release

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions