Merge pull request #154 from WillAbides/no-goenv

no goenv
WillAbides · May 29, 2023 · ba7806c · ba7806c
2 parents f0e803f + 6e1a44c
commit ba7806c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 123 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,25 +36,9 @@ jobs:
             ${{ steps.setup-go.outputs.GOCACHE }}
             ${{ steps.setup-go.outputs.GOMODCACHE }}
             .bindown
-          key: ${{ runner.os }}-go-lint-${{ hashFiles('**/go.sum', 'bindown.yml', 'Makefile', 'script/*') }}
+          key: ${{ runner.os }}-go-lint-${{ hashFiles('**/go.sum', 'bindown.yml', 'script/*') }}
           restore-keys: ${{ runner.os }}-go-lint
       - run: script/lint
-  make-bindown:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: WillAbides/setup-go-faster@v1
-        id: setup-go
-        with:
-          go-version: '1.20.x'
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ${{ steps.setup-go.outputs.GOCACHE }}
-            ${{ steps.setup-go.outputs.GOMODCACHE }}
-          key: ${{ runner.os }}-go-make-bindown-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-make-bindown
-      - run: make bin/bindown
   generate:
     runs-on: ubuntu-20.04
     steps:
@@ -80,7 +64,6 @@ jobs:
     needs:
       - test
       - lint
-      - make-bindown
       - generate
     if: github.ref == 'refs/heads/main' && github.event_name == 'push'
     env:

diff --git a/Makefile b/Makefile
diff --git a/internal/build-bootstrapper/build.go b/internal/build-bootstrapper/build.go
@@ -16,14 +16,13 @@ import (
 var assets embed.FS
 
 func execBindown(repoRoot string, arg ...string) error {
-	bindownPath := filepath.FromSlash("bin/bootstrapped/bindown")
-	makeCmd := exec.Command("make", bindownPath)
-	makeCmd.Dir = repoRoot
-	err := makeCmd.Run()
+	bootstrapCmd := exec.Command("script/bootstrap-bindown.sh", "-b", "bin/bootstrapped")
+	bootstrapCmd.Dir = repoRoot
+	err := bootstrapCmd.Run()
 	if err != nil {
 		return err
 	}
-	bindownCmd := exec.Command(bindownPath, arg...)
+	bindownCmd := exec.Command("bin/bootstrapped/bindown", arg...)
 	bindownCmd.Dir = repoRoot
 	return bindownCmd.Run()
 }

diff --git a/script/bindown b/script/bindown
@@ -4,6 +4,6 @@ set -e
 
 CDPATH="" cd -- "$(dirname -- "$(dirname -- "$0")")"
 
-make -s bin/bindown
+go build -o bin/bindown ./cmd/bindown
 
-bin/bindown "$@"
+exec bin/bindown "$@"
diff --git a/script/fmt b/script/fmt
@@ -4,9 +4,7 @@ set -e
 
 CDPATH="" cd -- "$(dirname -- "$(dirname -- "$0")")"
 
-. script/goenv
-
-make -s bin/gofumpt bin/shfmt
+script/bindown -q install gofumpt shfmt
 
 bin/gofumpt -w internal/*/*.go cmd/*/*.go
 

diff --git a/script/generate b/script/generate
@@ -31,8 +31,6 @@ if [ "$1" = "--check" ]; then
   exit 0
 fi
 
-. script/goenv
-
 script/generate-jsonschema
 
 go generate ./...

diff --git a/script/generate-jsonschema b/script/generate-jsonschema
@@ -4,9 +4,7 @@ set -e
 
 CDPATH="" cd -- "$(dirname -- "$(dirname -- "$0")")"
 
-. script/goenv
-
-make -s bin/yq
+script/bindown -q install yq
 
 go run ./internal/genjsonschema > bindown.schema.json
 cp bindown.schema.json ./internal/bindown/bindown.schema.json

diff --git a/script/goenv b/script/goenv
diff --git a/script/lint b/script/lint
@@ -4,9 +4,7 @@ set -e
 
 CDPATH="" cd -- "$(dirname -- "$(dirname -- "$0")")"
 
-. script/goenv
-
-make -s bin/golangci-lint bin/shellcheck
+script/bindown -q install golangci-lint shellcheck
 
 bin/golangci-lint run
 # Don't check bootstrap-bindown.sh because it's dynamically generated

diff --git a/script/release b/script/release
@@ -74,5 +74,5 @@ git fetch --tags
 bin/goreleaser release --clean
 
 # create bootstrap-bindown.sh
-go run ./internal/build-bootstrapper -tag "v$NEXT_VERSION" >bootstrap-bindown.sh
+go run ./internal/build-bootstrapper -tag "v$NEXT_VERSION" > bootstrap-bindown.sh
 bin/gh release upload "v$NEXT_VERSION" bootstrap-bindown.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,8 +31,6 @@ if [ "$1" = "--check" ]; then @@
       exit 0
     fi
-    . script/goenv
     script/generate-jsonschema
     go generate ./...
@@ Expand Down @@