diff --git a/.github/workflows/goreleaser-check.yml b/.github/workflows/goreleaser-check.yml index f13e721330..7e00d61472 100644 --- a/.github/workflows/goreleaser-check.yml +++ b/.github/workflows/goreleaser-check.yml @@ -13,7 +13,9 @@ jobs: # `goreleaser check` only parses the config; it needs neither Go nor # git history. - name: Check GoReleaser config - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v7 with: - version: latest + # Pinned: GoReleaser v2.10+ deprecates `brews`, which fails + # `goreleaser check`. Unpin after moving to `homebrew_casks`. + version: v2.9.0 args: check diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 35e3125826..7b48f00265 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -188,9 +188,10 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v7 with: - version: latest + # Keep in sync with the version in goreleaser-check.yml. + version: v2.9.0 # We use a different goreleaser config for releasing a new latest version vs. # releasing a patch on an older version. For releasing the new latest version, # we want to update the main (unversioned) Homebrew formula. For releasing a diff --git a/.goreleaser-patch.yml b/.goreleaser-patch.yml index 5650e19d6b..d0ba187d3b 100644 --- a/.goreleaser-patch.yml +++ b/.goreleaser-patch.yml @@ -3,6 +3,7 @@ # the Homebrew tap and does not publish a "latest" image to Docker Hub. It should match # .goreleaser.yml in every way except for the brews.name template and the # dockers.image_templates list. +version: 2 dist: release env: - GO111MODULE=on @@ -27,9 +28,9 @@ builds: - arm64 archives: - id: tarball - format: tar.gz + formats: tar.gz - id: bin - format: binary + formats: binary wrap_in_directory: false name_template: "src_{{ .Os }}_{{ .Arch }}" brews: @@ -37,12 +38,12 @@ brews: name: src-cli@{{ .Major }}.{{ .Minor }}.{{ .Patch }} homepage: "https://sourcegraph.com/" description: "Sourcegraph CLI" - tap: + repository: owner: sourcegraph name: homebrew-src-cli # Folder inside the repository to put the formula. # Default is the root folder. - folder: Formula + directory: Formula # We need to set this so that goreleaser doesn't think the binary is called # `src-cli` install: | diff --git a/.goreleaser.yml b/.goreleaser.yml index e82823cf09..6bfccb6d92 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,6 +2,7 @@ # release. It updates the main formula in the Homebrew tap. It should match # .goreleaser-patch.yml in every way except for the brews.name template and the # dockers.image_templates list. +version: 2 dist: release env: - GO111MODULE=on @@ -26,9 +27,9 @@ builds: - arm64 archives: - id: tarball - format: tar.gz + formats: tar.gz - id: bin - format: binary + formats: binary wrap_in_directory: false name_template: "src_{{ .Os }}_{{ .Arch }}" brews: diff --git a/renovate.json b/renovate.json index dee4083d81..a3dc1d00a1 100644 --- a/renovate.json +++ b/renovate.json @@ -5,5 +5,14 @@ "extends": [ "github>sourcegraph/renovate-config" ], + "packageRules": [ + { + "description": "GoReleaser v2.10+ deprecates brews, which fails goreleaser check. Remove after moving to homebrew_casks.", + "matchPackageNames": [ + "goreleaser/goreleaser" + ], + "allowedVersions": "<2.10.0" + } + ], "semanticCommits": false }