From 9532447271a10b527a424d8546d33c68679d6ab3 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sat, 13 Sep 2025 10:29:04 +0200 Subject: [PATCH] ci: don't use GOTOOLCHAIN for getting gotify/build image The setup-go action, sets GOTOOLCHAIN=local and breaks the release build. --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5bc5cfa..4ebe090 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,7 @@ LICENSE_DIR=./licenses/ BUILD_DIR=./build DOCKER_DIR=./docker/ SHELL := /bin/bash -ifdef GOTOOLCHAIN - GO_VERSION=$(GOTOOLCHAIN) -else - GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//') -endif +GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//') DOCKER_BUILD_IMAGE=docker.io/gotify/build 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}