From 9727f0ef452ff025f781ffa840288678652d5e4e Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 15:35:43 -0400 Subject: [PATCH 01/10] Fix prerelease --- .github/release-drafter.yml | 4 +++- .goreleaser.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index ae74e34ea..649933d1c 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -13,7 +13,9 @@ categories: - title: 'Maintenance' label: 'chore' - title: 'Dependencies' - label: 'dependencies' + collapse-after: 3 + labels: + - 'dependencies' change-template: '- $TITLE @$AUTHOR (#$NUMBER)' change-title-escapes: '\<*_&' version-resolver: diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f33bcff0e..0594705ec 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -44,7 +44,7 @@ release: owner: windsorcli name: cli draft: false - prerelease: false + prerelease: "{{ .Env.PRERELEASE }}" binary_signs: - cmd: gpg @@ -62,7 +62,7 @@ signs: brews: - name: windsor directory: Formula - skip_upload: false + skip_upload: "{{ eq .Env.SKIP_HOMEBREW \"true\" }}" repository: owner: windsorcli name: homebrew-cli From 77106b60dcee75a850e4c9b3af66aebf482d377b Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 15:59:00 -0400 Subject: [PATCH 02/10] Attempt to fix prerelease condition --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 0594705ec..b55b38fbe 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -44,7 +44,7 @@ release: owner: windsorcli name: cli draft: false - prerelease: "{{ .Env.PRERELEASE }}" + prerelease: "{{ eq .Env.PRERELEASE \"true\" }}" binary_signs: - cmd: gpg From 45f9eec7437f0e04c3cbb315a37303e21dca9ee9 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 16:33:17 -0400 Subject: [PATCH 03/10] Debug --- .github/workflows/ci.yaml | 4 ++++ .goreleaser.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 521840d8d..d19de7f5b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -121,11 +121,15 @@ jobs: - name: Set pre-release flag id: prerelease run: | + echo "Tag: ${{ github.ref }}" if [[ "${{ github.ref }}" =~ -[a-zA-Z0-9]+$ ]]; then + echo "Matched prerelease pattern" echo "prerelease=true" >> $GITHUB_OUTPUT else + echo "Did not match prerelease pattern" echo "prerelease=false" >> $GITHUB_OUTPUT fi + echo "Set prerelease to: ${{ steps.prerelease.outputs.prerelease }}" - name: Install GPG run: sudo apt-get update && sudo apt-get install -y gnupg diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b55b38fbe..ec840ae12 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -44,7 +44,7 @@ release: owner: windsorcli name: cli draft: false - prerelease: "{{ eq .Env.PRERELEASE \"true\" }}" + prerelease: "true" binary_signs: - cmd: gpg From 7959ff9a1dee9aea382d68c536e2fd9cc84bf05e Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 17:10:08 -0400 Subject: [PATCH 04/10] Debug --- .github/workflows/ci.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d19de7f5b..016589536 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -125,11 +125,16 @@ jobs: if [[ "${{ github.ref }}" =~ -[a-zA-Z0-9]+$ ]]; then echo "Matched prerelease pattern" echo "prerelease=true" >> $GITHUB_OUTPUT + echo "Set prerelease to: true" else echo "Did not match prerelease pattern" echo "prerelease=false" >> $GITHUB_OUTPUT + echo "Set prerelease to: false" fi - echo "Set prerelease to: ${{ steps.prerelease.outputs.prerelease }}" + + - name: Debug prerelease value + run: | + echo "Prerelease value: ${{ steps.prerelease.outputs.prerelease }}" - name: Install GPG run: sudo apt-get update && sudo apt-get install -y gnupg From dbfad7ce36ef04627951a57b33b3ea31fece13f3 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 17:34:01 -0400 Subject: [PATCH 05/10] Set prelrease from env var --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ec840ae12..0594705ec 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -44,7 +44,7 @@ release: owner: windsorcli name: cli draft: false - prerelease: "true" + prerelease: "{{ .Env.PRERELEASE }}" binary_signs: - cmd: gpg From 21611a2d11bf01cccdd44d539a5e09fae1c1aa44 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 17:36:50 -0400 Subject: [PATCH 06/10] Another attempt to fix prerelease --- .github/workflows/ci.yaml | 2 +- .goreleaser.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 016589536..2532689f4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -177,5 +177,5 @@ jobs: GPG_FINGERPRINT: ${{ env.GPG_FINGERPRINT }} HOMEBREW_CLI_WRITE_PAT: ${{ secrets.HOMEBREW_CLI_WRITE_PAT }} GITHUB_SHA: ${{ github.sha }} - PRERELEASE: ${{ steps.prerelease.outputs.prerelease }} + PRERELEASE: ${{ steps.prerelease.outputs.prerelease == 'true' }} SKIP_HOMEBREW: ${{ steps.prerelease.outputs.prerelease == 'true' }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 0594705ec..b55b38fbe 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -44,7 +44,7 @@ release: owner: windsorcli name: cli draft: false - prerelease: "{{ .Env.PRERELEASE }}" + prerelease: "{{ eq .Env.PRERELEASE \"true\" }}" binary_signs: - cmd: gpg From cc95830622f6b8945b48934350ffff9de6493928 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 18:13:21 -0400 Subject: [PATCH 07/10] debug --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2532689f4..32deec217 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -171,7 +171,7 @@ jobs: uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0 with: version: "~> v2" - args: release --clean + args: release --clean --debug env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GPG_FINGERPRINT: ${{ env.GPG_FINGERPRINT }} From a739e489e3c0dfd3dfd8635eb8fc0e54e01badec Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 18:33:24 -0400 Subject: [PATCH 08/10] set prerelease to auto --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b55b38fbe..4bc428f6e 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -44,7 +44,7 @@ release: owner: windsorcli name: cli draft: false - prerelease: "{{ eq .Env.PRERELEASE \"true\" }}" + prerelease: auto binary_signs: - cmd: gpg From 70e697bb30040c75e5c05751cb087459a2eac389 Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 18:34:17 -0400 Subject: [PATCH 09/10] Remove debug --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 32deec217..ef99cbf9d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -171,11 +171,10 @@ jobs: uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0 with: version: "~> v2" - args: release --clean --debug + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GPG_FINGERPRINT: ${{ env.GPG_FINGERPRINT }} HOMEBREW_CLI_WRITE_PAT: ${{ secrets.HOMEBREW_CLI_WRITE_PAT }} GITHUB_SHA: ${{ github.sha }} - PRERELEASE: ${{ steps.prerelease.outputs.prerelease == 'true' }} SKIP_HOMEBREW: ${{ steps.prerelease.outputs.prerelease == 'true' }} From 48db91fc5dd1651b379b555111dbacdf1428cd2a Mon Sep 17 00:00:00 2001 From: Ryan VanGundy Date: Thu, 8 May 2025 18:58:22 -0400 Subject: [PATCH 10/10] Remove prerelease entirely --- .github/workflows/ci.yaml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ef99cbf9d..6c82b7b5f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ on: - 'v[0-9]+.[0-9]+.[0-9]+-*' permissions: - contents: write # Allows creating releases + contents: write issues: read pull-requests: read jobs: @@ -118,24 +118,6 @@ jobs: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set pre-release flag - id: prerelease - run: | - echo "Tag: ${{ github.ref }}" - if [[ "${{ github.ref }}" =~ -[a-zA-Z0-9]+$ ]]; then - echo "Matched prerelease pattern" - echo "prerelease=true" >> $GITHUB_OUTPUT - echo "Set prerelease to: true" - else - echo "Did not match prerelease pattern" - echo "prerelease=false" >> $GITHUB_OUTPUT - echo "Set prerelease to: false" - fi - - - name: Debug prerelease value - run: | - echo "Prerelease value: ${{ steps.prerelease.outputs.prerelease }}" - - name: Install GPG run: sudo apt-get update && sudo apt-get install -y gnupg