♻ (autoupdate) Move auto update git code to autoupdate.sh

This commit is contained in:
Marcel Kapfer 2023-07-26 20:00:52 +02:00
parent 845b4eb1c4
commit 98b6be28d4
2 changed files with 16 additions and 26 deletions

View file

@ -5,7 +5,10 @@ set -euo pipefail
dir="$(find . -maxdepth 1 -type d -name "intellij-idea-*")" dir="$(find . -maxdepth 1 -type d -name "intellij-idea-*")"
pushd "$dir" || exit 1 pushd "$dir" || exit 1
set +e
check="$(uscan --dehs --no-download)" check="$(uscan --dehs --no-download)"
set -e
status="$(echo "$check" | xmllint --xpath 'string(/dehs/status)' -)" status="$(echo "$check" | xmllint --xpath 'string(/dehs/status)' -)"
if [[ "$status" != "newer package available" ]]; then if [[ "$status" != "newer package available" ]]; then
@ -17,4 +20,14 @@ new_version="$(echo "$check" | xmllint --xpath 'string(/dehs/upstream-version)'
popd popd
./update-new-version.sh --autoupdate "$new_version" ./update-new-version.sh "$new_version"
git add -A
git commit -m "Upstream version $new_version"
git switch main
git merge --ff-only version-"$new_version"
git push origin main
git tag -a v"$new_version" -m "Upstream version $new_version"
git push --tags origin main

View file

@ -1,8 +1,6 @@
#!/bin/bash #!/usr/bin/env bash
# #
# This script intends to decrease the effort of updating the package. # This script intends to decrease the effort of updating the package.
#
# Passing "--autoupdate" as first argument triggers automatic Git operations.
set -euo pipefail set -euo pipefail
@ -18,14 +16,7 @@ DISTRIBUTION="lunar"
last_tag=$(git describe --abbrev=0 --tags) last_tag=$(git describe --abbrev=0 --tags)
old="${last_tag#?}" old="${last_tag#?}"
new="$1"
if [ "$1" = "--autoupdate" ]; then
new="$2"
autoupdate="y"
else
new="$1"
autoupdate="n"
fi
name="$(git config --get user.name)" name="$(git config --get user.name)"
email="$(git config --get user.email)" email="$(git config --get user.email)"
@ -51,17 +42,3 @@ debuild -us -uc
cd .. cd ..
rm "$PACKAGE"_"$old"-* rm "$PACKAGE"_"$old"-*
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
git tag -a v"$new" -m "Upstream version $new"
git push --tags origin main