From d3142ddd1c530cb00605b16995cb08db24e8f1a1 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Wed, 12 Jul 2023 21:40:11 +0200 Subject: [PATCH 1/2] chore(renovate): add regex for most dependencies --- Dockerfile | 10 ++++---- config/.go-version | 2 +- config/.java-version | 2 +- config/.php-version | 2 +- renovate.json | 58 +++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a3750f546..62b30259c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG NODE_VERSION=18.14.2 -ARG JAVA_VERSION=11.0.18 -ARG PHP_VERSION=8.1.16 -ARG GO_VERSION=1.19.7 -ARG DART_VERSION=3.0.0 +ARG NODE_VERSION=18.16.1 +ARG JAVA_VERSION=11.0.19 +ARG PHP_VERSION=8.2.8 +ARG GO_VERSION=1.20.6 +ARG DART_VERSION=3.0.2 FROM golang:${GO_VERSION}-bullseye as go-builder diff --git a/config/.go-version b/config/.go-version index 98adfe8e12..e63679c766 100644 --- a/config/.go-version +++ b/config/.go-version @@ -1 +1 @@ -1.19.7 +1.20.6 diff --git a/config/.java-version b/config/.java-version index 0c44568973..57ba2e7fe0 100644 --- a/config/.java-version +++ b/config/.java-version @@ -1 +1 @@ -11.0.18 +11.0.19 diff --git a/config/.php-version b/config/.php-version index 2b9d04f1ff..fc10bd4825 100644 --- a/config/.php-version +++ b/config/.php-version @@ -1 +1 @@ -8.1.16 +8.2.8 diff --git a/renovate.json b/renovate.json index 55d181345a..cf0101f44f 100644 --- a/renovate.json +++ b/renovate.json @@ -47,7 +47,7 @@ "package.mustache" ], "matchStrings": [ - "\"devDependencies\":\\s*{[^}]*}", + "\"(dev)?[dD]ependencies\":\\s*{[^}]*}", "\\s\"(?.*?)\": \"(?.*?)\",?\\s" ], "matchStringsStrategy": "recursive", @@ -83,6 +83,58 @@ ], "depNameTemplate": "yarnpkg/berry", "datasourceTemplate": "github-releases" + }, + { + "description": "Update composer.json for PHP", + "fileMatch": "composer.mustache", + "matchStrings": [ + "\"require(-dev)?\":\\s*{[^}]*}", + "\"(?.*?)\": \"(?.*?)\",?\\s" + ], + "matchStringsStrategy": "recursive", + "datasourceTemplate": "packagist" + }, + { + "description": "Update pubspec.yaml for Dart", + "fileMatch": "pubspec.mustache", + "matchStrings": [ + "(dev_)?dependencies:\\s*{[^}]*}", + "\\s(?.*?):\\s*(?.*?)" + ], + "matchStringsStrategy": "recursive", + "datasourceTemplate": "dart" + }, + { + "description": "Update libs.versions.toml for Kotlin", + "fileMatch": "libs.versions.toml", + "matchStrings": [ + "(?.*?):.*?(?\\d+\\.\\d+\\.\\d+)" + ], + "datasourceTemplate": "maven" + }, + { + "description": "Update .java-version", + "fileMatch": ".java-version", + "matchStrings": [ + "(?.*?)" + ], + "datasourceTemplate": "java-version" + }, + { + "description": "Update .dart-version", + "fileMatch": ".dart-version", + "matchStrings": [ + "(?.*?)" + ], + "datasourceTemplate": "dart-version" + }, + { + "description": "Update .go-version", + "fileMatch": ".go-version", + "matchStrings": [ + "(?.*?)" + ], + "datasourceTemplate": "golang-version" } ], "ignorePaths": [ @@ -99,6 +151,10 @@ "clients/algoliasearch-client-php/composer.json", "tests/output/**" ], + "includePaths": [ + "tests/output/javascript/.yarn/**", + "tests/output/kotlin/gradle/**" + ], "prHourlyLimit": 20, "prConcurrentLimit": 50 } From eeadf768e8591ddec1adf626b069d90bc6a3b55f Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Wed, 12 Jul 2023 22:08:13 +0200 Subject: [PATCH 2/2] also docker --- Dockerfile | 5 +++++ renovate.json | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62b30259c8..09a4fc6c0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ +# renovate: datasource=github-tags depName=nodejs/node versioning=node ARG NODE_VERSION=18.16.1 +# renovate: datasource=java-version depName=java ARG JAVA_VERSION=11.0.19 +# renovate: datasource=github-tags depName=php/php-sec ARG PHP_VERSION=8.2.8 +# renovate: datasource=golang-version depName=golang ARG GO_VERSION=1.20.6 +# renovate: datasource=dart-version depName=dart ARG DART_VERSION=3.0.2 FROM golang:${GO_VERSION}-bullseye as go-builder diff --git a/renovate.json b/renovate.json index cf0101f44f..a33f5a6766 100644 --- a/renovate.json +++ b/renovate.json @@ -118,7 +118,8 @@ "matchStrings": [ "(?.*?)" ], - "datasourceTemplate": "java-version" + "datasourceTemplate": "java-version", + "depNameTemplate": "java" }, { "description": "Update .dart-version", @@ -126,7 +127,8 @@ "matchStrings": [ "(?.*?)" ], - "datasourceTemplate": "dart-version" + "datasourceTemplate": "dart-version", + "depNameTemplate": "dart" }, { "description": "Update .go-version", @@ -134,7 +136,16 @@ "matchStrings": [ "(?.*?)" ], - "datasourceTemplate": "golang-version" + "datasourceTemplate": "golang-version", + "depNameTemplate": "golang" + }, + { + "description": "update Dockerfile", + "fileMatch": "^Dockerfile$", + "matchStrings": [ + "datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\sARG .*?_VERSION=(?.*)\\s" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" } ], "ignorePaths": [