From 0cd48f335a1bd029a0757811404a2604cc280861 Mon Sep 17 00:00:00 2001
From: Joseph Kato <joseph@jdkato.io>
Date: Fri, 7 Jun 2024 19:15:28 -0700
Subject: [PATCH] chore: switch to `jdkato/choco-cross`

---
 .github/workflows/main.yml | 21 ++-------------------
 .gitignore                 |  2 ++
 Makefile                   |  8 ++++----
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c466e98..78569b41 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,31 +16,14 @@ jobs:
         with:
           go-version: "1.21"
 
-      - name: Install Chocolatey
-        run: |
-          mkdir -p /opt/chocolatey
-          wget -q -O - "https://github.com/chocolatey/choco/releases/download/${CHOCOLATEY_VERSION}/chocolatey.v${CHOCOLATEY_VERSION}.tar.gz" | tar -xz -C "/opt/chocolatey"
-          echo '#!/bin/bash' >> /usr/local/bin/choco
-          echo 'mono /opt/chocolatey/choco.exe $@' >> /usr/local/bin/choco
-          chmod +x /usr/local/bin/choco
-        env:
-          CHOCOLATEY_VERSION: 1.3.1
-
-      - name: Test Chocolatey
-        run: |
-          choco help
-
       - name: Setup release environment
         run: |-
           echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env
           echo 'CHOCOLATEY_API_KEY=${{secrets.CHOCOLATEY_API_KEY}}' >> .release-env
 
-      - name: "GoReleaser"
-        run: make gr
+      - name: GoReleaser
+        run: make choco-cross
         if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}
 
   lint:
     name: runner / vale
diff --git a/.gitignore b/.gitignore
index 59df5acb..de8b8a71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,8 @@ fixtures/formats/Sphinx/_build/
 *.sublime-workspace
 *.sublime-project
 
+.release-env
+
 # Files
 *.o
 *.a
diff --git a/Makefile b/Makefile
index fdf1afcd..957faa72 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE_NAME          := github.com/errata-ai/vale/v3
-GOLANG_CROSS_VERSION  ?= v1.19.5
+GOLANG_CROSS_VERSION  ?= v0.1.0
 
 SYSROOT_DIR     ?= sysroots
 SYSROOT_ARCHIVE ?= sysroots.tar.bz2
@@ -9,7 +9,7 @@ CURR_SHA=$(shell git rev-parse --verify HEAD)
 
 LDFLAGS=-ldflags "-s -w -X main.version=$(LAST_TAG)"
 
-.PHONY: data test lint install rules setup bench compare release gr
+.PHONY: data test lint install rules setup bench compare release choco-cross
 
 all: build
 
@@ -63,7 +63,7 @@ docker:
 	--push \
 	.
 
-gr:
+choco-cross:
 	@docker run \
 		--rm \
 		-e CGO_ENABLED=1 \
@@ -72,5 +72,5 @@ gr:
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-v `pwd`/sysroot:/sysroot \
 		-w /go/src/$(PACKAGE_NAME) \
-		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
+		jdkato/choco-cross:${GOLANG_CROSS_VERSION} \
 		release --clean