From 618ed2bb5cf8628c667ffaabdc031f68084da51d Mon Sep 17 00:00:00 2001 From: autoupdate Date: Wed, 19 Jul 2023 23:40:08 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=E2=99=BB=20Use=20autoupdate=20name=20consi?= =?UTF-8?q?stently=20across=20all=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs: #8 --- update-new-version.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update-new-version.sh b/update-new-version.sh index bbba768..3ae1f9b 100755 --- a/update-new-version.sh +++ b/update-new-version.sh @@ -21,10 +21,10 @@ old="${last_tag#?}" if [ "$1" = "--autoupdate" ]; then new="$2" - autogit="y" + autoupdate="y" else new="$1" - autogit="n" + autoupdate="n" fi name="$(git config --get user.name)" @@ -52,7 +52,7 @@ cd .. rm "$PACKAGE"_"$old"-* -if [ "$autogit" = "n" ]; then +if [ "$autoupdate" = "n" ]; then exit fi From ac512f5bde88a764d72c0c71d89b98ac920510f2 Mon Sep 17 00:00:00 2001 From: autoupdate Date: Wed, 19 Jul 2023 23:40:42 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20Add=20and=20commit=20changes?= =?UTF-8?q?=20for=20autoupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs: #8 --- update-new-version.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/update-new-version.sh b/update-new-version.sh index 3ae1f9b..2037b60 100755 --- a/update-new-version.sh +++ b/update-new-version.sh @@ -56,6 +56,9 @@ if [ "$autoupdate" = "n" ]; then exit fi +git add -A +git commit -m "Upstream version $new" + git switch main git merge --ff-only version-"$new" git push origin main From efabda309b2f611a193d42594517f7ebc0a1dd77 Mon Sep 17 00:00:00 2001 From: autoupdate Date: Wed, 19 Jul 2023 23:41:08 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20Don't=20sign=20tag=20during?= =?UTF-8?q?=20autoupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a temporary restriction since during the implementation of building the autoupdate functionality and the pipeline handling GPG additionally would be a bit too much at once. Refs: #8 --- update-new-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-new-version.sh b/update-new-version.sh index 2037b60..c3b0865 100755 --- a/update-new-version.sh +++ b/update-new-version.sh @@ -63,5 +63,5 @@ git switch main git merge --ff-only version-"$new" git push origin main -git tag -s v"$new" "Upstream version $new" +git tag -a v"$new" "Upstream version $new" git push --tags origin main