please.sh build-mingw-w64-git: optionally reset pkgrel
#534
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
Typically, when we build new Git (pre-)releases, we want the `pkgrel` to be reset to 1, if it has been incremented in the meantime. Let's add an option for `please.sh`'s sub-command that is used in the automation over at https://github.com/git-for-windows/git-for-windows-automation/blob/HEAD/.github/workflows/git-artifacts.yml and then adjust that workflow to use it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to dscho/git-for-windows-automation
that referenced
this pull request
Nov 20, 2023
In case some update was necessary between releases, we need to increment the `pkgrel` so that we can deploy new `mingw-w64-git` package versions. However, the next release should reset that `pkgrel` back to 1. Noticed by Matthias Aßhauer in git-for-windows/git#4692 (comment). The script that is used to build `mingw-w64-git` has been adjusted accordingly in git-for-windows/build-extra#534 and with this change, we use the new `--reset-pkgrel` option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was referenced Nov 20, 2023
Merged
rimrul
approved these changes
Nov 20, 2023
| @@ -3441,6 +3441,9 @@ build_mingw_w64_git () { # [--only-i686] [--only-x86_64] [--only-aarch64] [--ski | |||
| --skip-doc-html) | |||
| sed_makepkg_e="$sed_makepkg_e"' -e s/"\${MINGW_PACKAGE_PREFIX}-\${_realname}-doc-html"//' | |||
| ;; | |||
| --reset-pkgrel) | |||
| sed_makepkg_e="$sed_makepkg_e"' -e s/^pkgrel=[0-9][0-9]*$/pkgrel=1/' | |||
There was a problem hiding this comment.
This could probably be ^pkgrel=[1-9][0-9]*$
There was a problem hiding this comment.
Well, I used to sometimes use pkgrel=0 to prepare packages for new versions without actually releasing them yet... Maybe we can leave it at [0-9][0-9]*?
There was a problem hiding this comment.
I'll merge this now, should we agree that the more stringent pattern is needed, I can always change it as a follow-up after v2.43.0 is released.
ammyk9
pushed a commit
to ammyk9/git-for-windows-automation
that referenced
this pull request
Aug 8, 2024
In case some update was necessary between releases, we need to increment the `pkgrel` so that we can deploy new `mingw-w64-git` package versions. However, the next release should reset that `pkgrel` back to 1. Noticed by Matthias Aßhauer in git-for-windows/git#4692 (comment). The script that is used to build `mingw-w64-git` has been adjusted accordingly in git-for-windows/build-extra#534 and with this change, we use the new `--reset-pkgrel` option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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.
As @rimrul noticed, between v2.43.0-rc1 and v2.43.0-rc2 we did not reset
pkgrel=1.This is part 1 of the two-parter to address this (and I plan on merging this today, in time for v2.43.0 final).