chore: switch to jdkato/choco-cross

errata-ai · Jun 8, 2024 · 5ad8412 · 5ad8412
1 parent b193fde
commit 5ad8412
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,31 +16,20 @@ 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"
+      - name: Test Chocolatey
+        run: make choco
+
+      - name: "[Build] GoReleaser"
+        run: make gr-build
+
+      - name: GoReleaser
         run: make gr
         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/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 gr gr-build choco
 
 all: build
 
@@ -63,6 +63,18 @@ docker:
 	--push \
 	.
 
+choco:
+	@docker run \
+		--rm \
+		-e CGO_ENABLED=1 \
+		--env-file .release-env \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		-v `pwd`:/go/src/$(PACKAGE_NAME) \
+		-v `pwd`/sysroot:/sysroot \
+		-w /go/src/$(PACKAGE_NAME) \
+		jdkato/choco-cross:${GOLANG_CROSS_VERSION} \
+		choco help
+
 gr:
 	@docker run \
 		--rm \
@@ -72,5 +84,17 @@ gr:
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-v `pwd`/sysroot:/sysroot \
 		-w /go/src/$(PACKAGE_NAME) \
-		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
-		release --clean
+		jdkato/choco-cross:${GOLANG_CROSS_VERSION} \
+		goreleaser release --clean
+
+gr-build:
+	@docker run \
+		--rm \
+		-e CGO_ENABLED=1 \
+		--env-file .release-env \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		-v `pwd`:/go/src/$(PACKAGE_NAME) \
+		-v `pwd`/sysroot:/sysroot \
+		-w /go/src/$(PACKAGE_NAME) \
+		jdkato/choco-cross:${GOLANG_CROSS_VERSION} \
+		goreleaser build --clean --debug