Skip to content

Commit

Permalink
go get go1.19.3
Browse files Browse the repository at this point in the history
Signed-off-by: James Hamlin <[email protected]>
  • Loading branch information
jfhamlin committed Aug 16, 2023
1 parent b816f5b commit e19471f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- uses: cachix/install-nix-action@v19
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix-shell --run 'make test'
- run: nix-shell --run 'PATH=$(go env GOPATH):$PATH make test'
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@ TEST_TARGETS := $(addsuffix .test,$(TEST_FILES))
GOPLATFORMS := darwin_arm64 darwin_amd64 linux_arm64 linux_amd64 windows
GLJIMPORTS=$(foreach platform,$(GOPLATFORMS),pkg/gen/gljimports/gljimports_$(platform).go)

GO_VERSION := 1.19.3 # eventually, support multiple minor versions
# eventually, support multiple minor versions
GO_VERSION := 1.19.3
GO_CMD := go$(GO_VERSION)

.PHONY: all
all: $(STDLIB_TARGETS) generate $(GLJIMPORTS)

.PHONY: gocmd
gocmd:
@go$(GO_VERSION) version > /dev/null || (go install golang.org/dl/$(GO_VERSION) && $(GO_CMD) version)
@$(GO_CMD) version 2>&1 > /dev/null || \
(go install "golang.org/dl/$(GO_CMD)@latest" && \
echo $(value PATH) && \
$(GO_CMD) download > /dev/null && $(GO_CMD) version > /dev/null)

.PHONY: generate
generate:
Expand Down

0 comments on commit e19471f

Please sign in to comment.