diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba6ecc10e3..2f23f8c9c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -184,11 +184,11 @@ jobs: # Create the GitHub release notes, upload artifact backups to S3, publish homebrew recipe - name: Run GoReleaser - uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: distribution: goreleaser - version: latest - args: release --rm-dist --debug + version: "~> v2" + args: release --clean --verbose env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}} HOMEBREW_TAP_GITHUB_TOKEN: ${{ steps.brew-tap-token.outputs.token }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2699443597..8743d5d263 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,5 @@ +version: 2 + before: hooks: - go mod tidy @@ -72,7 +74,7 @@ release: # Update the 'generic' brew formula and create a versioned brew formula for artifacts from this release brews: - name: "{{ .Env.BREW_NAME }}" - tap: + repository: owner: defenseunicorns name: homebrew-tap token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}" @@ -91,7 +93,7 @@ brews: # NOTE: We are using .Version instead of .Tag because homebrew has weird semver parsing rules and won't be able to # install versioned releases that has a `v` character before the version number. - name: "zarf@{{ .Version }}" - tap: + repository: owner: defenseunicorns name: homebrew-tap token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}" @@ -111,4 +113,4 @@ blobs: - provider: s3 region: us-gov-west-1 bucket: zarf-public - folder: "release/{{.Version}}" + directory: "release/{{.Version}}"