From 52b8ea39860a14c4adcdadfac076b48193d1503d Mon Sep 17 00:00:00 2001 From: Bart Dorlandt Date: Thu, 11 Sep 2025 14:49:14 +0200 Subject: [PATCH 1/2] docs(github-actions): fix recommended upstream detection script's upstream name parsing --- docs/configuration/automatic-releases/github-actions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/automatic-releases/github-actions.rst b/docs/configuration/automatic-releases/github-actions.rst index 57cd7b507..a46bb1460 100644 --- a/docs/configuration/automatic-releases/github-actions.rst +++ b/docs/configuration/automatic-releases/github-actions.rst @@ -903,7 +903,7 @@ to the GitHub Release Assets as well. run: | set +o pipefail - UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | cut -d' ' -f2 | grep -E '\.{3}' | cut -d'.' -f4)" + UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | awk -F '\\.\\.\\.' '{print $2}' | cut -d ' ' -f1)" printf '%s\n' "Upstream branch name: $UPSTREAM_BRANCH_NAME" set -o pipefail From b564a484bfdbee890dd35064a0ddfd64d1271635 Mon Sep 17 00:00:00 2001 From: codejedi365 Date: Fri, 12 Sep 2025 20:52:28 -0600 Subject: [PATCH 2/2] ci(release): update verify upstream script to handle various branch names --- .github/workflows/verify_upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify_upstream.sh b/.github/workflows/verify_upstream.sh index 3e8a38ac2..8444eba57 100644 --- a/.github/workflows/verify_upstream.sh +++ b/.github/workflows/verify_upstream.sh @@ -5,7 +5,7 @@ set -eu +o pipefail # Example output of `git status -sb`: # ## master...origin/master [behind 1] # M .github/workflows/verify_upstream.sh -UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | cut -d' ' -f2 | grep -E '\.{3}' | cut -d'.' -f4)" +UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | awk -F '\\.\\.\\.' '{print $2}' | cut -d ' ' -f1)" printf '%s\n' "Upstream branch name: $UPSTREAM_BRANCH_NAME" set -o pipefail