colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: don't use GOTOOLCHAIN for getting gotify/build image 

The setup-go action, sets GOTOOLCHAIN=local and breaks the release
build.
This commit is contained in:
Jannis Mattheis 2025-09-13 10:29:04 +02:00
parent 93ffad9abe
commit 9532447271
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -2,11 +2,7 @@ LICENSE_DIR=./licenses/
BUILD_DIR=./build BUILD_DIR=./build
DOCKER_DIR=./docker/ DOCKER_DIR=./docker/
SHELL := /bin/bash SHELL := /bin/bash
ifdef GOTOOLCHAIN GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
GO_VERSION=$(GOTOOLCHAIN)
else
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
endif
DOCKER_BUILD_IMAGE=docker.io/gotify/build DOCKER_BUILD_IMAGE=docker.io/gotify/build
DOCKER_WORKDIR=/proj DOCKER_WORKDIR=/proj
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} 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}