primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 12:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

added environment argument for golang version (#1361)

Browse Source 
* added environment argument for golang version

* Revert: added environment argument for golang version (84298506)

* reverted to specifying go version 1.12 as the default

* fix spacing
This commit is contained in:
Mark Dodgson
2019-09-04 22:21:10 +01:00
committed by Aaron Schlesinger
parent 99477da3cc
commit 5444309405
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+9 -2
View File
@@ -1,5 +1,10 @@
VERSION = "unset"
DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)
ifndef GOLANG_VERSION
override GOLANG_VERSION = 1.12
endif
.PHONY: build
build: ## build the athens proxy
cd cmd/proxy && go build
@@ -47,7 +52,8 @@ test-unit: ## run unit tests with race detector and code coverage enabled
.PHONY: test-unit-docker
test-unit-docker: ## run unit tests with docker
docker-compose -p athensunit up --exit-code-from=testunit --build testunit
docker-compose -p athensunit build --build-arg GOLANG_VERSION=${GOLANG_VERSION} testunit
docker-compose -p athensunit up --exit-code-from=testunit testunit
docker-compose -p athensunit down
.PHONY: test-e2e
@@ -56,7 +62,8 @@ test-e2e:
.PHONY: test-e2e-docker
test-e2e-docker:
docker-compose -p athense2e up --build --exit-code-from=teste2e teste2e
docker-compose -p athense2e build --build-arg GOLANG_VERSION=${GOLANG_VERSION} teste2e
docker-compose -p athense2e up --exit-code-from=teste2e teste2e
docker-compose -p athense2e down
.PHONY: docker