From 96b682bd12bd8c1eb634a41fee8983bdb2d49a43 Mon Sep 17 00:00:00 2001 From: jakobmoellerdev Date: Mon, 18 Nov 2024 13:28:21 +0100 Subject: [PATCH 1/3] chore: also create a tag to avoid dangling commits currently our tagged releases do not have branch accomodating them, leading to dangling commits. This fixes this by also creating an appropriate release branch. This might introduce issues with things like the release drafter though, so this is likely only the first line of commits for this --- .github/workflows/release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5abef6913..507ac7cbc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -160,7 +160,8 @@ jobs: git commit -m "Release $RELEASE_VERSION" msg="Release ${{ env.RELEASE_VERSION }}" git tag --annotate --message "${msg}" ${{ env.RELEASE_VERSION }} - git push origin ${{ env.RELEASE_VERSION }} + # push both the tag as well as a release branch with that tag. + git push origin releases/${{ env.RELEASE_VERSION }} ${{ env.RELEASE_VERSION }} - name: Create GPG Token file from Secret run: | From bf305631610ad3b39da75972c596c7b0470ef21b Mon Sep 17 00:00:00 2001 From: jakobmoellerdev Date: Mon, 18 Nov 2024 16:25:04 +0100 Subject: [PATCH 2/3] chore: only run release drafter on non-patch --- .github/workflows/release-drafter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index 1901afcea..371282b75 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - releases/* + - 'releases/v[0-9]+.[0-9]+' permissions: contents: read From ac5c922c56f0b92f0e7c8187127a3ef185889f48 Mon Sep 17 00:00:00 2001 From: jakobmoellerdev Date: Mon, 18 Nov 2024 16:26:02 +0100 Subject: [PATCH 3/3] chore: only run release drafter on non-patch --- .github/workflows/release-drafter.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index 371282b75..607cf7613 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -3,6 +3,9 @@ name: Release Drafter on: push: branches: + # we only want to draft release notes for the base version, + # e.g. for releases/v0.18, we draft v0.18.0 for all RCs + # this means that we explicitly don't want to draft release notes for releases/v0.18.0 or releases/v0.18.1 - 'releases/v[0-9]+.[0-9]+' permissions: