Merge remote-tracking branch 'origin/main' into use-default-json

risu729 · Jan 2, 2025 · 7fd15d2 · 7fd15d2
2 parents 6af00fe + 9b2fee2
commit 7fd15d2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 32 deletions.
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.0
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.0
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -74,7 +74,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.0
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -100,7 +100,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.0
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.0
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/mise.toml b/mise.toml
@@ -1,7 +1,7 @@
 # ref: https://mise.jdx.dev/configuration.html
 #:schema https://mise.jdx.dev/schema/mise.json
 
-min_version = "2024.12.24"
+min_version = "2025.1.0"
 
 [tools]
 bun = "1.1.42"
@@ -23,7 +23,7 @@ taplo = "0.9.3"
 "npm:prettier" = "3.4.2"
 yamlfmt = "0.14.0"
 yamllint = "1.35.1"
-"npm:renovate" = "39.86.4"
+"npm:renovate" = "39.87.0"
 "npm:cspell" = "8.17.1"
 "cargo:lychee" = "0.18.0"
 typos = "1.29.0"

diff --git a/src/default.json5 b/src/default.json5
@@ -22,65 +22,54 @@
 		{
 			customType: "regex",
 			description: "Updates tool versions in mise.toml (default registry)",
-			// prettier-ignore
-			fileMatch: ["mise\.toml", "mise/config\\.toml"],
+			fileMatch: ["(^|/)\\.?mise\\.toml$", "(^|/)\\.?mise/config\\.toml$"],
 			// cspell:ignore datasource
 			datasourceTemplate: "{{#unless datasource}}github-releases{{else}}{{datasource}}{{/unless}}",
 			matchStrings: [
 				// test: https://regex101.com/r/8grHta
-				// prettier-ignore
-				"# renovate:(?: datasource=(?<datasource>.+?))?(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>.+?))?(?: extractVersion=(?<extractVersion>.+?))?\\n\"?(?<depName>[^:]+?)\"? *= *\"(?<currentValue>.+?)\"",
+				'# renovate:(?: datasource=(?<datasource>.+?))?(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>.+?))?(?: extractVersion=(?<extractVersion>.+?))?\\n"?(?<depName>[^:]+?)"? *= *"(?<currentValue>.+?)"',
 			],
 		},
 		// renovate does not support backends
 		// ref: https://github.com/renovatebot/renovate/issues/30387
 		{
 			customType: "regex",
 			description: "Updates tool versions in mise.toml (Cargo backend)",
-			// prettier-ignore
-			fileMatch: ["mise\.toml", "mise/config\\.toml"],
+			fileMatch: ["(^|/)\\.?mise\\.toml$", "(^|/)\\.?mise/config\\.toml$"],
 			datasourceTemplate: "crate",
 			matchStrings: [
 				// test: https://regex101.com/r/K6Imdx
-				// prettier-ignore
-				"\"cargo:(?<depName>.+?)\" *= *\"(?<currentValue>.+?)\"",
+				'"cargo:(?<depName>.+?)" *= *"(?<currentValue>.+?)"',
 			],
 		},
 		{
 			customType: "regex",
 			description: "Updates tool versions in mise.toml (npm backend)",
-			// prettier-ignore
-			fileMatch: ["mise\.toml", "mise/config\\.toml"],
+			fileMatch: ["(^|/)\\.?mise\\.toml$", "(^|/)\\.?mise/config\\.toml$"],
 			datasourceTemplate: "npm",
 			matchStrings: [
 				// test: https://regex101.com/r/avOpdb
-				// prettier-ignore
-				"\"npm:(?<depName>.+?)\" *= *\"(?<currentValue>.+?)\"",
+				'"npm:(?<depName>.+?)" *= *"(?<currentValue>.+?)"',
 			],
 		},
 		{
 			customType: "regex",
 			description: "Updates tool versions in mise.toml (ubi, aqua backend)",
-			// prettier-ignore
-			fileMatch: ["mise\.toml", "mise/config\\.toml"],
+			fileMatch: ["(^|/)\\.?mise\\.toml$", "(^|/)\\.?mise/config\\.toml$"],
 			datasourceTemplate: "github-releases",
 			matchStrings: [
 				// test: https://regex101.com/r/RRA3NI
-				// prettier-ignore
-				"(?:# renovate: extractVersion=(?<extractVersion>.+?)\\n)?\"(?:ubi|aqua):(?<depName>.+?)\" *= *\".*?(?<currentValue>\\d+\\..+?)\"",
+				'(?:# renovate: extractVersion=(?<extractVersion>.+?)\\n)?"(?:ubi|aqua):(?<depName>.+?)" *= *".*?(?<currentValue>\\d+\\..+?)"',
 			],
 		},
 		{
 			customType: "regex",
 			description: "Updates min_version in mise config",
-			fileMatch: ["mise\\.toml", "mise/config\\.toml"],
+			fileMatch: ["(^|/)\\.?mise\\.toml$", "(^|/)\\.?mise/config\\.toml$"],
 			datasourceTemplate: "github-releases",
 			depNameTemplate: "mise",
 			packageNameTemplate: "jdx/mise",
-			matchStrings: [
-				// prettier-ignore
-				"min_version = \"(?<currentValue>.+)\"",
-			],
+			matchStrings: ['min_version = "(?<currentValue>.+)"'],
 		},
 		{
 			customType: "regex",
@@ -89,10 +78,7 @@
 			datasourceTemplate: "github-releases",
 			depNameTemplate: "mise",
 			packageNameTemplate: "jdx/mise",
-			matchStrings: [
-				// prettier-ignore
-				"version: (?<currentValue>.+)",
-			],
+			matchStrings: ["version: (?<currentValue>.+)"],
 		},
 	],
 	packageRules: [