From 3adcfb8b143f25191217a77f56f95e2b19a1f396 Mon Sep 17 00:00:00 2001
From: Patrick Schratz <patrick.schratz@gmail.com>
Date: Wed, 30 Oct 2024 14:21:50 +0100
Subject: [PATCH] Fix renovate support for `xgo` (#4276)

---
 .cspell.json           |  1 +
 .github/renovate.json  |  8 +++++---
 Makefile               |  3 ++-
 docker/Dockerfile.make | 17 +++--------------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.cspell.json b/.cspell.json
index bcd060e80..34dc4ce65 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -252,6 +252,7 @@
     "pnpm-lock.yaml",
     "**/node_modules/**/*",
     "cmd/server/docs/docs.go",
+    "renovate.json",
     // TODO: remove the following
     "docs/**/*.js",
     "docs/**/*.ts"
diff --git a/.github/renovate.json b/.github/renovate.json
index 12bfdacfa..af75951fa 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -2,12 +2,13 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["github>woodpecker-ci/renovate-config"],
   "automergeType": "pr",
+  "enabledManagers": ["woodpecker"],
   "customManagers": [
     {
       "customType": "regex",
       "fileMatch": ["shared/constant/constant.go"],
       "matchStrings": [
-        "//\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+DefaultCloneImage = \"docker.io/woodpeckerci/plugin-git:(?<currentValue>.*)\""
+        "//\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+DefaultClonePlugin = \"docker.io/woodpeckerci/plugin-git:(?<currentValue>.*)\""
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     }
@@ -61,9 +62,10 @@
       "matchFileNames": ["docs/**/package.json"]
     },
     {
+      "description": "Extract version from xgo container tags",
       "matchDatasources": ["docker"],
-      "matchPackagePatterns": ["xgo"],
-      "versioning": "regex:^go-(?<major>\\d+)?(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))$"
+      "matchPackagePatterns": ["techknowlogick/xgo"],
+      "versioning": "regex:^go-(?<major>\\d+)\\.(?<minor>\\d+)\\.x$"
     }
   ]
 }
diff --git a/Makefile b/Makefile
index 8ab78b0c6..43e87b2b9 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ CGO_ENABLED ?= 1 # only used to compile server
 
 HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
 ifeq ($(HAS_GO),GO)
-	XGO_VERSION ?= go-1.20.x
+  # renovate: datasource=docker depName=docker.io/techknowlogick/xgo
+	XGO_VERSION ?= go-1.22.x
 	CGO_CFLAGS ?= $(shell go env CGO_CFLAGS)
 endif
 CGO_CFLAGS ?=
diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make
index c556b49c6..8bedc7dae 100644
--- a/docker/Dockerfile.make
+++ b/docker/Dockerfile.make
@@ -1,19 +1,8 @@
 # docker build --rm  -f docker/Dockerfile.make -t woodpecker/make:local .
-FROM docker.io/golang:1.23-alpine3.19 as golang_image
-FROM docker.io/node:23-alpine3.19
+FROM docker.io/golang:1.23-alpine as golang_image
+FROM docker.io/node:23-alpine
 
-# renovate: datasource=repology depName=alpine_3_19/make versioning=loose
-ENV MAKE_VERSION="4.4.1-r2"
-# renovate: datasource=repology depName=alpine_3_19/gcc versioning=loose
-ENV GCC_VERSION="13.2.1_git20231014-r0"
-# renovate: datasource=repology depName=alpine_3_19/binutils-gold versioning=loose
-ENV BINUTILS_GOLD_VERSION="2.41-r0"
-# renovate: datasource=repology depName=alpine_3_19/musl-dev versioning=loose
-ENV MUSL_DEV_VERSION="1.2.4_git20230717-r4"
-# renovate: datasource=repology depName=alpine_3_19/protoc versioning=loose
-ENV PROTOC_VERSION="24.4-r0"
-
-RUN apk add --no-cache --update make=${MAKE_VERSION} gcc=${GCC_VERSION} binutils-gold=${BINUTILS_GOLD_VERSION} musl-dev=${MUSL_DEV_VERSION} protoc=${PROTOC_VERSION} && \
+RUN apk add --no-cache --update make gcc binutils-gold musl-dev protoc && \
   corepack enable
 
 # Build packages.