From 640d2618b8d5d12ad34778ce0f99170fb68d28d8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 8 Oct 2023 13:11:06 +0200 Subject: [PATCH 1/2] Add build/backport.sh --- build/backport.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 build/backport.sh diff --git a/build/backport.sh b/build/backport.sh new file mode 100644 index 0000000000000..9e5be3d76ba42 --- /dev/null +++ b/build/backport.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -euo pipefail + +backport() { + if [ $# -eq 0 ]; then; echo "backport PR VERSION"; exit 1; fi + PR="$1" + VER="$2" + + git checkout "release/v$VER" || git checkout -b "release/v$VER" + git fetch origin "release/v$VER" + git reset --hard "origin/release/v$VER" + git branch -D "backport-$PR-$VER" + git checkout -b "backport-$PR-$VER" + HASH="$(curl -sH "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/repos/go-gitea/gitea/pulls/$PR" | jq -r .merge_commit_sha)" + git cherry-pick "$HASH" +} From f4c27cf69a694862887b9522eb3518bdb2ff75e4 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 8 Oct 2023 13:24:47 +0200 Subject: [PATCH 2/2] ignore branch delete errors --- build/backport.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/backport.sh b/build/backport.sh index 9e5be3d76ba42..c2c6b9059b11b 100644 --- a/build/backport.sh +++ b/build/backport.sh @@ -9,7 +9,7 @@ backport() { git checkout "release/v$VER" || git checkout -b "release/v$VER" git fetch origin "release/v$VER" git reset --hard "origin/release/v$VER" - git branch -D "backport-$PR-$VER" + git branch -D "backport-$PR-$VER" &>/dev/null || true git checkout -b "backport-$PR-$VER" HASH="$(curl -sH "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/repos/go-gitea/gitea/pulls/$PR" | jq -r .merge_commit_sha)" git cherry-pick "$HASH"