release-git: update the `release` branch if necessary

git-for-windows / git-for-windows-automation

A few GitHub workflows and support code to help with Git for Windows' day-to-day tasks

10 stars 9 forks source link

release-git: update the `release` branch if necessary #43

Closed dscho closed 1 year ago

dscho commented 1 year ago

We already have a check to verify that the release branch is up to date with the main branch before even starting the release-git workflow run for real.

But we can do better than telling the user when the branch is not up to date: We can easily try to update it in the workflow run ;-)

dscho commented 1 year ago

For the record, I plan on testing this while releasing the next -rc0.

dscho commented 1 year ago

The release vs. main setup is quite confusing, but I think I understand what it's doing.

Yes, I understand. It is the "least worst" solution I found to a problem that has no proper solution.

Assuming that understanding is correct, one general question I have is - have the "run job, stage fails, update release, then re-run failed jobs" scenario been tested?

Yes, it has! Here:

and here: