Skip to content

Commit

Permalink
remove specific go version
Browse files Browse the repository at this point in the history
  • Loading branch information
JustinDFuller committed Dec 18, 2023
1 parent a2c04e0 commit c9e5cbb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
1 change: 0 additions & 1 deletion .appengine/build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#!/bin/bash
alias go1.21.5="go"
make server & (sleep 60 && make build)
14 changes: 5 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ export COLOR_BLUE='\e[0;34m'
export GAE_DEPLOYMENT_ID=localhost/$(shell date --iso=seconds)
export PORT=9000

ifeq ($(go1.21.5),)
go1.21.5 := go
endif

.PHONY: validate
validate:
@echo ${COLOR_GRAY}Validating files.${COLOR_NC};
Expand All @@ -29,17 +25,17 @@ validate:
.PHONY: tidy
tidy:
@echo ${COLOR_GRAY}Begin go mod tidy.${COLOR_NC};
@go1.21.5 mod tidy;
@go mod tidy;

.PHONY: generate
generate:
@echo ${COLOR_GRAY}Begin go generate.${COLOR_NC};
@go1.21.5 generate ./...;
@go generate ./...;

.PHONY: vet
vet:
@echo ${COLOR_GRAY}Begin go vet.${COLOR_NC};
@go1.21.5 vet ./...;
@go vet ./...;

.PHONY: lint
lint:
Expand All @@ -53,14 +49,14 @@ endif
.PHONY: format
format:
@echo ${COLOR_GRAY}Begin go fmt.${COLOR_NC};
@go1.21.5 fmt ./...;
@go fmt ./...;
@echo ${COLOR_GRAY}Begin npm test.${COLOR_NC};
@npm run test --silent;

.PHONY: server
server: validate tidy generate vet format lint
@echo ${COLOR_GRAY}Begin go run.${COLOR_NC};
@go1.21.5 run -race main.go;
@go run -race main.go;

.PHONY: server-watch
server-watch:
Expand Down

0 comments on commit c9e5cbb

Please sign in to comment.