Skip to content

Commit 473e7f8

Browse files
committed
ci: don't depend on toolchain version
43890be increased the go directive to 1.26.0, which made go mod tidy remove the `toolchain go1.26.0` line. This caused the Makefile to resolve the build image to `gotify/build:null-x`.
1 parent 592dc45 commit 473e7f8

3 files changed

Lines changed: 3 additions & 18 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ jobs:
77
# Run on push for branches in this repo, and on pull_request only for forks.
88
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.repository != github.event.pull_request.head.repo.full_name)
99
steps:
10+
- uses: actions/checkout@v7
1011
- uses: actions/setup-go@v7
1112
with:
12-
go-version: 1.26.x
13+
go-version-file: GO_VERSION
1314
- uses: actions/setup-node@v7
1415
with:
1516
node-version: '24'
16-
- uses: actions/checkout@v7
1717
- run: (cd ui && yarn)
1818
- run: make build-js
1919
- uses: golangci/golangci-lint-action@v9

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ LICENSE_DIR=./licenses/
22
BUILD_DIR=./build
33
DOCKER_DIR=./docker/
44
SHELL := /bin/bash
5-
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
5+
GO_VERSION=$(shell cat GO_VERSION)
66
DOCKER_BUILD_IMAGE=docker.io/gotify/build
77
DOCKER_WORKDIR=/proj
88
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}

‎renovate.json‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,6 @@
3232
"autoReplaceStringTemplate": "{{{newValue}}}",
3333
"datasourceTemplate": "docker",
3434
"versioningTemplate": "docker"
35-
},
36-
{
37-
"customType": "regex",
38-
"managerFilePatterns": [
39-
"/^go.mod$/"
40-
],
41-
"depTypeTemplate": "language",
42-
"matchStrings": [
43-
"toolchain go(?<currentValue>[0-9.]+)\\n"
44-
],
45-
"extractVersionTemplate": "^(?<version>.+)-linux-amd64$",
46-
"depNameTemplate": "docker.io/gotify/build",
47-
"autoReplaceStringTemplate": "toolchain go{{{newValue}}}\n",
48-
"datasourceTemplate": "docker",
49-
"versioningTemplate": "docker"
5035
}
5136
],
5237
"ignoreDeps": [

0 commit comments

Comments
 (0)