From: Jeremy Cline <jcline@xxxxxxxxxx> The release scripts are supposed create a set of branches if the release is based of a tag rather than a snapshot. davidlt noted on IRC that branches were missing for recent tags, namely rc3 and rc4. The reason is that the check for a signed tag expects $UPSTREAM_REF to be the tag. Resolve $UPSTREAM_REF to a tag (if it exists) prior to verifying the tag. Signed-off-by: Jeremy Cline <jcline@xxxxxxxxxx> --- redhat/scripts/ci/ark-create-release.sh | 2 +- redhat/scripts/ci/ark-rebase-patches.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh index fd57e533ddb4..83b102ceb54f 100755 --- a/redhat/scripts/ci/ark-create-release.sh +++ b/redhat/scripts/ci/ark-create-release.sh @@ -37,7 +37,7 @@ git checkout os-build git checkout os-build ./redhat/scripts/ci/ark-update-configs.sh "$UPSTREAM_REF" "$PROJECT_ID" -if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then +if git tag -v "$(git describe --exact-match "$UPSTREAM_REF")"; then git checkout -b ark/"$UPSTREAM_REF" ark/patches/"$UPSTREAM_REF" RELEASE_BRANCHES=" ark/$UPSTREAM_REF ark/patches/$UPSTREAM_REF" else diff --git a/redhat/scripts/ci/ark-rebase-patches.sh b/redhat/scripts/ci/ark-rebase-patches.sh index 2ac22bcba3bd..4a02176bde88 100755 --- a/redhat/scripts/ci/ark-rebase-patches.sh +++ b/redhat/scripts/ci/ark-rebase-patches.sh @@ -102,7 +102,7 @@ else exit 2 fi -if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then +if git tag -v "$(git describe --exact-match "$UPSTREAM_REF")"; then printf "Creating branch \"ark/patches/%s\"\n" "$UPSTREAM_REF" git branch ark/patches/"$UPSTREAM_REF" printf "Don't forget to run 'git push <remote> ark/patches/%s'\n" "$UPSTREAM_REF" -- 2.26.2 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
