From e80b646af4970bc059387180955be9a3fefa703d Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 30 Dec 2024 06:32:36 -0800 Subject: [PATCH] Revert "ci: Consolidate templates for release drafter" (#7606) Reverts firezone/firezone#7597 Release drafter unfortunately gets confused if multiple releases share the same config name --- .github/release-drafter-gateway.yml | 57 +++++++++++++++++++ .github/release-drafter-gui-client.yml | 57 +++++++++++++++++++ .github/release-drafter-headless-client.yml | 57 +++++++++++++++++++ ...r.yml => release-drafter-macos-client.yml} | 1 + .github/workflows/ci.yml | 11 ++-- 5 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 .github/release-drafter-gateway.yml create mode 100644 .github/release-drafter-gui-client.yml create mode 100644 .github/release-drafter-headless-client.yml rename .github/{release-drafter.yml => release-drafter-macos-client.yml} (81%) diff --git a/.github/release-drafter-gateway.yml b/.github/release-drafter-gateway.yml new file mode 100644 index 000000000..dc6e19c70 --- /dev/null +++ b/.github/release-drafter-gateway.yml @@ -0,0 +1,57 @@ +tag-prefix: "gateway-" +autolabeler: + - label: "area/ci" + title: + - "/^ci/i" + - label: "kind/test" + title: + - "/^test/i" + - label: "kind/feature" + title: + - "/^feat/i" + - label: "kind/bug" + title: + - "/^fix/i" + - "/^bug/i" + - label: "kind/refactor" + title: + - "/^refactor/i" + - label: "kind/chore" + title: + - "/^chore/i" + - label: "kind/docs" + title: + - "/^docs/i" + - label: "kind/security" + title: + - "/^security/i" + - label: "dependencies" + title: + - "/^deps/i" +categories: + - title: "✨ Features" + labels: + - "kind/feature" + - title: "🐛 Bug Fixes" + labels: + - "kind/bug" + - title: "🧰 Maintenance" + label: + - "area/ci" + - "kind/test" + - "kind/refactor" + - "kind/chore" + - "kind/cleanup" + - "dependencies" + - title: "📝 Documentation" + label: "kind/docs" + - title: "🔐 Security" + label: "kind/security" +exclude-labels: + - "skip-changelog" +change-template: "- $TITLE @$AUTHOR (#$NUMBER)" +change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. +template: > + Please see our + [changelog](https://www.firezone.dev/changelog?utm_source=github-releases) + for more details. diff --git a/.github/release-drafter-gui-client.yml b/.github/release-drafter-gui-client.yml new file mode 100644 index 000000000..38717469c --- /dev/null +++ b/.github/release-drafter-gui-client.yml @@ -0,0 +1,57 @@ +tag-prefix: "gui-client-" +autolabeler: + - label: "area/ci" + title: + - "/^ci/i" + - label: "kind/test" + title: + - "/^test/i" + - label: "kind/feature" + title: + - "/^feat/i" + - label: "kind/bug" + title: + - "/^fix/i" + - "/^bug/i" + - label: "kind/refactor" + title: + - "/^refactor/i" + - label: "kind/chore" + title: + - "/^chore/i" + - label: "kind/docs" + title: + - "/^docs/i" + - label: "kind/security" + title: + - "/^security/i" + - label: "dependencies" + title: + - "/^deps/i" +categories: + - title: "✨ Features" + labels: + - "kind/feature" + - title: "🐛 Bug Fixes" + labels: + - "kind/bug" + - title: "🧰 Maintenance" + label: + - "area/ci" + - "kind/test" + - "kind/refactor" + - "kind/chore" + - "kind/cleanup" + - "dependencies" + - title: "📝 Documentation" + label: "kind/docs" + - title: "🔐 Security" + label: "kind/security" +exclude-labels: + - "skip-changelog" +change-template: "- $TITLE @$AUTHOR (#$NUMBER)" +change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. +template: > + Please see our + [changelog](https://www.firezone.dev/changelog?utm_source=github-releases) + for more details. diff --git a/.github/release-drafter-headless-client.yml b/.github/release-drafter-headless-client.yml new file mode 100644 index 000000000..dafd72a21 --- /dev/null +++ b/.github/release-drafter-headless-client.yml @@ -0,0 +1,57 @@ +tag-prefix: "headless-client-" +autolabeler: + - label: "area/ci" + title: + - "/^ci/i" + - label: "kind/test" + title: + - "/^test/i" + - label: "kind/feature" + title: + - "/^feat/i" + - label: "kind/bug" + title: + - "/^fix/i" + - "/^bug/i" + - label: "kind/refactor" + title: + - "/^refactor/i" + - label: "kind/chore" + title: + - "/^chore/i" + - label: "kind/docs" + title: + - "/^docs/i" + - label: "kind/security" + title: + - "/^security/i" + - label: "dependencies" + title: + - "/^deps/i" +categories: + - title: "✨ Features" + labels: + - "kind/feature" + - title: "🐛 Bug Fixes" + labels: + - "kind/bug" + - title: "🧰 Maintenance" + label: + - "area/ci" + - "kind/test" + - "kind/refactor" + - "kind/chore" + - "kind/cleanup" + - "dependencies" + - title: "📝 Documentation" + label: "kind/docs" + - title: "🔐 Security" + label: "kind/security" +exclude-labels: + - "skip-changelog" +change-template: "- $TITLE @$AUTHOR (#$NUMBER)" +change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. +template: > + Please see our + [changelog](https://www.firezone.dev/changelog?utm_source=github-releases) + for more details. diff --git a/.github/release-drafter.yml b/.github/release-drafter-macos-client.yml similarity index 81% rename from .github/release-drafter.yml rename to .github/release-drafter-macos-client.yml index 779119587..a795e50d7 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter-macos-client.yml @@ -1,3 +1,4 @@ +tag-prefix: "macos-client-" template: > Please see our [changelog](https://www.firezone.dev/changelog?utm_source=github-releases) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed43e801b..86593a785 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: secrets: inherit update-release-draft: - name: update-release-draft-${{ matrix.job_suffix }} + name: update-release-draft-${{ matrix.config_name }} runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -48,16 +48,16 @@ jobs: include: # mark:next-gateway-version - release_name: gateway-1.4.3 - job_suffix: gateway + config_name: release-drafter-gateway.yml # mark:next-headless-version - release_name: headless-client-1.4.1 - job_suffix: headless-client + config_name: release-drafter-headless-client.yml # mark:next-gui-version - release_name: gui-client-1.4.1 - job_suffix: gui-client + config_name: release-drafter-gui-client.yml # mark:next-apple-version - release_name: macos-client-1.4.0 - job_suffix: macos-client + config_name: release-drafter-macos-client.yml steps: - uses: release-drafter/release-drafter@v6 @@ -65,6 +65,7 @@ jobs: if: ${{ github.ref_name == 'main' }} id: update-release-draft with: + config-name: ${{ matrix.config_name }} tag: ${{ matrix.release_name }} version: ${{ matrix.release_name }} name: ${{ matrix.release_name }}