From b477731ade2a8f326a58ec461d3e907a7d34185f Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Tue, 6 Feb 2024 23:33:17 +0100 Subject: [PATCH 1/3] renovate.json: disable automerge temporary --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 97b15e3..cddcb10 100644 --- a/renovate.json +++ b/renovate.json @@ -7,10 +7,10 @@ "packageRules": [ { "matchPackagePatterns": ["*"], - "automerge": true, + "automerge": false, "automergeType": "pr", "platformAutomerge": true, "dependencyDashboard": true } ] -} \ No newline at end of file +} From 709a8bbf5accce0009f22249462bcfd7837885d7 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Tue, 6 Feb 2024 23:34:40 +0100 Subject: [PATCH 2/3] force golang 1.21.6 until fix --- .drone.yml | 4 ++-- Dockerfile | 2 +- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6244b30..c3e5b5d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,14 +3,14 @@ name: build steps: - name: gofmt - image: golang:1.21.7 + image: golang:1.21.6 commands: - gofmt -l -s . when: event: - push - name: vuln-check - image: golang:1.21.7 + image: golang:1.21.6 commands: - go install golang.org/x/vuln/cmd/govulncheck@latest - govulncheck ./... diff --git a/Dockerfile b/Dockerfile index 3b41e63..80b70f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.7-bookworm AS build +FROM golang:1.21.6-bookworm AS build # Create build workspace folder WORKDIR /workspace diff --git a/go.mod b/go.mod index 4557d2d..eb7e133 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module git.ar21.de/yolokube/country-geo-locations -go 1.21.7 +go 1.21.6 require ( github.com/alecthomas/kong v0.8.1 From 59083ae70dff8e00e574af7bd10be9c9f0ed5148 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 Feb 2024 03:19:24 +0000 Subject: [PATCH 3/3] Update golang Docker tag to v1.22.0 --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index c3e5b5d..efb9561 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,14 +3,14 @@ name: build steps: - name: gofmt - image: golang:1.21.6 + image: golang:1.22.0 commands: - gofmt -l -s . when: event: - push - name: vuln-check - image: golang:1.21.6 + image: golang:1.22.0 commands: - go install golang.org/x/vuln/cmd/govulncheck@latest - govulncheck ./... diff --git a/Dockerfile b/Dockerfile index 80b70f7..60a3cdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6-bookworm AS build +FROM golang:1.22.0-bookworm AS build # Create build workspace folder WORKDIR /workspace