Skip to content

Commit 8c07a4c

Browse files
committed
open-pr(msys2-runtime): use a nicer commit message
The commit message is technically correct, but it lists the full OID of the `msys2/msys2-runtime` commit, which is not very helpful. Let's instead use the package version as documented in the `PKGBUILD` file in the commit message. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 59e98be commit 8c07a4c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/open-pr.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,12 @@ jobs:
118118
update_script="$GITHUB_WORKSPACE/update-scripts/version/$PACKAGE_TO_UPGRADE"
119119
if test -f "$update_script"
120120
then
121-
$update_script "$UPGRADE_TO_VERSION"
121+
$update_script "$UPGRADE_TO_VERSION" &&
122+
if test -f UPGRADE_TO_VERSION
123+
then
124+
UPGRADE_TO_VERSION="$(cat UPGRADE_TO_VERSION)" &&
125+
rm UPGRADE_TO_VERSION
126+
fi
122127
else
123128
sed -i \
124129
-e "s/^\\(pkgver=\\).*/\\1$UPGRADE_TO_VERSION/" \

update-scripts/version/msys2-runtime

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,6 @@ if test -n "$update_pkgver"
7676
then
7777
git reset --soft HEAD^ &&
7878
sed -i 's/^pkgrel=.*/pkgrel=1/' PKGBUILD
79-
fi
79+
fi &&
80+
sed -n '/^pkgver=/{:1;N;/pkgrel=/{s/.*pkgver=\([0-9\.]*\).*pkgrel=\([0-9]*\).*/\1-\2/p;q};b1}' \
81+
<PKGBUILD >UPGRADE_TO_VERSION

0 commit comments

Comments
 (0)