From 09c1516a170dfb47d29644db622655b540b94922 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sun, 10 Feb 2019 13:44:00 +0100 Subject: [PATCH] Use GO_VERSION inside travis build --- .travis.yml | 3 +-- Makefile | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 019bc42..0562075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: go -go: - - "1.11.5" notifications: email: false @@ -12,6 +10,7 @@ env: - GO111MODULE=on before_install: + - eval "$(gimme $(< GO_VERSION))"; - make download-tools install: diff --git a/Makefile b/Makefile index 3447fe0..280d089 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ LICENSE_DIR=./licenses/ BUILD_DIR=./build/ DOCKER_DIR=./docker/ SHELL := /bin/bash +GO_VERSION=`cat GO_VERSION` test: test-coverage test-race test-js check: check-go check-swagger check-js @@ -75,16 +76,16 @@ build-js: (cd ui && npm run build) build-linux-amd64: - docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-linux-amd64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-amd64 /proj + docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:$(GO_VERSION)-linux-amd64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-amd64 /proj build-linux-arm-7: - docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-linux-arm-7 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-arm-7 /proj + docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:$(GO_VERSION)-linux-arm-7 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-arm-7 /proj build-linux-arm64: - docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-linux-arm64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-arm64 /proj + docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:$(GO_VERSION)-linux-arm64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-arm64 /proj build-windows-amd64: - docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-windows-amd64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-windows-amd64.exe /proj + docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:$(GO_VERSION)-windows-amd64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-windows-amd64.exe /proj build: build-linux-arm-7 build-linux-amd64 build-linux-arm64 build-windows-amd64