diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2295dc96e5..e69640ee37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,11 +23,11 @@ jobs: - name: "Place wintun.dll" run: cp deps/wintun/bin/amd64/wintun.dll ./ - name: build - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v7 env: BUILD_ENV: "development" with: - version: latest + version: "~> v2" args: build --clean --snapshot --verbose - name: Upload flyctl for preflight uses: actions/upload-artifact@v6 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9dd3dc94f2..cd59dc54b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,10 +95,10 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser if: steps.cache.outputs.cache-hit != 'true' # do not run if cache hit - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v7 with: distribution: goreleaser-pro - version: latest + version: "~> v2" args: release --clean -f .goreleaser.2.yml --fail-fast --split env: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} @@ -143,10 +143,10 @@ jobs: overwrite: true - name: Github release if: steps.cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master' - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v7 with: distribution: goreleaser-pro - version: latest + version: "~> v2" args: continue --merge env: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} diff --git a/.goreleaser.2.yml b/.goreleaser.2.yml index e6fcfc221a..8519c60c58 100644 --- a/.goreleaser.2.yml +++ b/.goreleaser.2.yml @@ -1,6 +1,8 @@ # This config targets the new flypkgs distribution system. Once all releases are # being served by flypkgs, this file will replace .goreleaser.yml and .goreleaser.dev.yml +version: 2 + env: - BUILD_ENV={{if index .Env "BUILD_ENV"}}{{.Env.BUILD_ENV}}{{else}}production{{end}} diff --git a/.goreleaser.yml b/.goreleaser.yml index 8ee35e59f0..29ddbdc54a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,5 @@ +version: 2 + env: - BUILD_ENV={{if index .Env "BUILD_ENV"}}{{.Env.BUILD_ENV}}{{else}}production{{end}} @@ -95,7 +97,7 @@ checksum: name_template: "checksums.txt" snapshot: - name_template: "{{.Version}}-{{.Branch}}.{{.CommitTimestamp}}" + version_template: "{{.Version}}-{{.Branch}}.{{.CommitTimestamp}}" changelog: sort: asc @@ -108,7 +110,7 @@ brews: - repository: owner: superfly name: homebrew-tap - folder: Formula + directory: Formula homepage: https://fly.io skip_upload: auto test: |