From 8c5b72a384c30ac4540bf7d7b2f3d50ff5463cbb Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Wed, 27 Mar 2024 18:08:55 +0900 Subject: [PATCH] fix: change versioningTemplate to versioning (#535) https://github.com/renovatebot/renovate/discussions/28150#discussioncomment-8925362 --- default.json | 3 ++- installer-script.json | 6 ++++-- jsonnet/default.jsonnet | 1 + jsonnet/installer-script.jsonnet | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default.json b/default.json index 9dd7cbc..44feeac 100644 --- a/default.json +++ b/default.json @@ -13,7 +13,8 @@ " +(?:aqua_version|'aqua_version'|\"aqua_version\") *: +(?[^'\" \\n]+)", " +(?:aqua_version|'aqua_version'|\"aqua_version\") *: +'(?[^'\" \\n]+)'", " +(?:aqua_version|'aqua_version'|\"aqua_version\") *: +\"(?[^'\" \\n]+)\"" - ] + ], + "versioningTemplate": "semver" }, { "customType": "regex", diff --git a/installer-script.json b/installer-script.json index 4ee2ef7..e3b6cfd 100644 --- a/installer-script.json +++ b/installer-script.json @@ -9,7 +9,8 @@ ], "matchStrings": [ "raw\\.githubusercontent\\.com/aquaproj/aqua-installer/(?[^'\" \\n]+)/aqua-installer" - ] + ], + "versioningTemplate": "semver" }, { "customType": "regex", @@ -22,7 +23,8 @@ "aqua-installer +(\\| +(ba|z)?sh +-s +-- +)?(-i +\\S+ +)?-v +(?[^'\" \\n]+)\\s", "aqua-installer +(\\| +(ba|z)?sh +-s +-- +)?(-i +\\S+ +)?-v +'(?[^'\" \\n]+)'\\s", "aqua-installer +(\\| +(ba|z)?sh +-s +-- +)?(-i +\\S+ +)?-v +\"(?[^'\" \\n]+)\"\\s" - ] + ], + "versioningTemplate": "semver" } ] } diff --git a/jsonnet/default.jsonnet b/jsonnet/default.jsonnet index cbf500d..b3c9d01 100644 --- a/jsonnet/default.jsonnet +++ b/jsonnet/default.jsonnet @@ -38,6 +38,7 @@ local utils = import 'utils.libsonnet'; " +%s *: +'%s'" % [utils.wrapQuote('aqua_version'), utils.currentValue], ' +%s *: +"%s"' % [utils.wrapQuote('aqua_version'), utils.currentValue], ], + versioningTemplate: 'semver', // https://github.com/renovatebot/renovate/discussions/28150#discussioncomment-8925362 depNameTemplate: 'aquaproj/aqua', datasourceTemplate: 'github-releases', }, diff --git a/jsonnet/installer-script.jsonnet b/jsonnet/installer-script.jsonnet index 6cfdafb..603173e 100644 --- a/jsonnet/installer-script.jsonnet +++ b/jsonnet/installer-script.jsonnet @@ -10,6 +10,7 @@ local utils = import 'utils.libsonnet'; ], datasourceTemplate: 'github-releases', depNameTemplate: 'aquaproj/aqua-installer', + versioningTemplate: 'semver', // https://github.com/renovatebot/renovate/discussions/28150#discussioncomment-8925362 }, { customType: "regex", @@ -21,6 +22,7 @@ local utils = import 'utils.libsonnet'; ], datasourceTemplate: 'github-releases', depNameTemplate: 'aquaproj/aqua', + versioningTemplate: 'semver', // https://github.com/renovatebot/renovate/discussions/28150#discussioncomment-8925362 }, ], }