Skip to content

Commit 9532447

Browse files
committed
ci: don't use GOTOOLCHAIN for getting gotify/build image
The setup-go action, sets GOTOOLCHAIN=local and breaks the release build.
1 parent 93ffad9 commit 9532447

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ LICENSE_DIR=./licenses/
22
BUILD_DIR=./build
33
DOCKER_DIR=./docker/
44
SHELL := /bin/bash
5-
ifdef GOTOOLCHAIN
6-
GO_VERSION=$(GOTOOLCHAIN)
7-
else
8-
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
9-
endif
5+
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
106
DOCKER_BUILD_IMAGE=docker.io/gotify/build
117
DOCKER_WORKDIR=/proj
128
DOCKER_RUN=docker run --rm -e LD_FLAGS="$$LD_FLAGS" -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR}

0 commit comments

Comments
 (0)