fix: always replace unversioned tools

cashapp · Oct 26, 2023 · 4455c35 · 4455c35
1 parent ef05c4b
commit 4455c35
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/go-tools.yml b/.github/workflows/go-tools.yml
@@ -18,11 +18,19 @@ jobs:
  run: ./bin/hermit env --raw >> $GITHUB_ENV
  - name: Build Go
  run: make -C go-tools
- - name: Upload Release
+ - name: Upload Versioned
  uses: ncipollo/release-action@v1
  with:
  tag: go-tools
  allowUpdates: true
  replacesArtifacts: false
  artifacts: "go-tools/*.bz2"
  token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Upload Unversioned
+ uses: ncipollo/release-action@v1
+ with:
+ tag: go-tools
+ allowUpdates: true
+ replacesArtifacts: true
+ artifacts: "go-tools/unversioned/*.bz2"
+ token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/go-tools/Makefile b/go-tools/Makefile
@@ -1,3 +1,4 @@
+export CGO_ENABLED = 0
 export GOOS ?= $(shell go env GOOS)
 export GOARCH ?= $(shell go env GOARCH)
 
@@ -24,13 +25,14 @@ all: sync
 
 sync:
  test -r go.mod || go mod init install
- #go get $$(for tool in $(UNVERSIONED_TOOLS); do echo $$tool@latest; done) $$(for tool in $(TOOLS); do echo $$(echo $$tool | tr : /); done)
+ go get $$(for tool in $(UNVERSIONED_TOOLS); do echo $$tool@latest; done) $$(for tool in $(TOOLS); do echo $$(echo $$tool | tr : /); done)
 
 build:
+ mkdir -p unversioned
  for tool in $(UNVERSIONED_TOOLS); do \
  go get $$tool; \
- go build -o $$(basename $$tool)-$(SUFFIX) $$tool; \
- bzip2 -9 $$(basename $$tool)-$(SUFFIX); \
+ go build -o unversioned/$$(basename $$tool)-$(SUFFIX) $$tool; \
+ bzip2 -9 unversioned/$$(basename $$tool)-$(SUFFIX); \
  done
  for tool in $(TOOLS); do \
  module=$$(echo $$tool | cut -d: -f1); \
@@ -44,4 +46,4 @@ build:
  done
 
 clean:
- rm -f *$(SUFFIX) *$(SUFFIX).bz2
+ rm -f *$(SUFFIX) *$(SUFFIX).bz2 unversioned/*$(SUFFIX).bz2
diff --git a/go-tools/go.mod b/go-tools/go.mod
@@ -3,7 +3,7 @@ module install
 go 1.19
 
 require (
- connectrpc.com/connect v1.11.1 // indirect
+ connectrpc.com/connect v1.12.0 // indirect
  github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
  github.com/BurntSushi/toml v1.0.0 // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
@@ -20,7 +20,7 @@ require (
  github.com/cloudflare/circl v1.1.0 // indirect
  github.com/coveooss/gotemplate/v3 v3.7.2 // indirect
  github.com/coveooss/multilogger v0.5.2 // indirect
- github.com/dmarkham/enumer v1.5.8 // indirect
+ github.com/dmarkham/enumer v1.5.9 // indirect
  github.com/drhodes/goLorem v0.0.0-20220328165741-da82e5b29246 // indirect
  github.com/emirpasic/gods v1.18.1 // indirect
  github.com/fatih/color v1.13.0 // indirect

diff --git a/go-tools/go.sum b/go-tools/go.sum
@@ -37,6 +37,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 connectrpc.com/connect v1.11.1 h1:dqRwblixqkVh+OFBOOL1yIf1jS/yP0MSJLijRj29bFg=
 connectrpc.com/connect v1.11.1/go.mod h1:3AGaO6RRGMx5IKFfqbe3hvK1NqLosFNP2BxDYTPmNPo=
+connectrpc.com/connect v1.12.0 h1:HwKdOY0lGhhoHdsza+hW55aqHEC64pYpObRNoAgn70g=
+connectrpc.com/connect v1.12.0/go.mod h1:3AGaO6RRGMx5IKFfqbe3hvK1NqLosFNP2BxDYTPmNPo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AlecAivazis/survey/v2 v2.3.6 h1:NvTuVHISgTHEHeBFqt6BHOe4Ny/NwGZr7w+F8S9ziyw=
 github.com/AlecAivazis/survey/v2 v2.3.6/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
@@ -104,6 +106,8 @@ github.com/dmarkham/enumer v1.5.7 h1:xYJA/lGoniiuhZLASBUbpPjScUslfyDHUAMczeflCeg
 github.com/dmarkham/enumer v1.5.7/go.mod h1:eAawajOQnFBxf0NndBKgbqJImkHytg3eFEngUovqgo8=
 github.com/dmarkham/enumer v1.5.8 h1:fIF11F9l5jyD++YYvxcSH5WgHfeaSGPaN/T4kOQ4qEM=
 github.com/dmarkham/enumer v1.5.8/go.mod h1:d10o8R3t/gROm2p3BXqTkMt2+HMuxEmWCXzorAruYak=
+github.com/dmarkham/enumer v1.5.9 h1:NM/1ma/AUNieHZg74w67GkHFBNB15muOt3sj486QVZk=
+github.com/dmarkham/enumer v1.5.9/go.mod h1:e4VILe2b1nYK3JKJpRmNdl5xbDQvELc6tQ8b+GsGk6E=
 github.com/drhodes/goLorem v0.0.0-20160418191928-ecccc744c2d9/go.mod h1:TIxuNVHtT3urYBYt4MjSidVsu3iRPheODUo8uVCPmJg=
 github.com/drhodes/goLorem v0.0.0-20220328165741-da82e5b29246 h1:QfrFeqj65DaFzkNF462ovq66y3RoNwIyUclZ63mh1UY=
 github.com/drhodes/goLorem v0.0.0-20220328165741-da82e5b29246/go.mod h1:TIxuNVHtT3urYBYt4MjSidVsu3iRPheODUo8uVCPmJg=