Merge branch 'main' into use-aqua-for-lychee

risu729 · Jan 11, 2025 · 0f21056 · 0f21056
2 parents d3bede3 + 321e9be
commit 0f21056
Show file tree

Hide file tree

Showing 25 changed files with 428 additions and 406 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -1,143 +1,15 @@
 {
 	// ref: https://docs.renovatebot.com/configuration-options/
 	$schema: "https://docs.renovatebot.com/renovate-schema.json",
-	extends: [
-		"config:best-practices",
-		":pinVersions",
-		// cspell:ignore automerge
-		":automergeMinor",
-		":automergeDigest",
-		":prHourlyLimitNone",
-		":prConcurrentLimitNone",
-	],
-	labels: [
-		"dependencies",
-		"{{#unless (equals manager 'regex')}}{{manager}}{{/unless}}",
-	],
-	// ref: https://docs.renovatebot.com/modules/manager/regex/#advanced-capture
-	customManagers: [
-		// renovate does not support tools not listed
-		// ref: https://docs.renovatebot.com/modules/manager/mise/#additional-information
-		{
-			customType: "regex",
-			description: "Updates tool versions in mise.toml (default registry)",
-			// prettier-ignore
-			fileMatch: ["mise\.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 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"],
-			datasourceTemplate: "crate",
-			matchStrings: [
-				// test: https://regex101.com/r/K6Imdx
-				// prettier-ignore
-				"\"cargo:(?<depName>.+?)\" *= *\"(?<currentValue>.+?)\"",
-			],
-		},
-		{
-			customType: "regex",
-			description: "Updates tool versions in mise.toml (npm backend)",
-			// prettier-ignore
-			fileMatch: ["mise\.toml"],
-			datasourceTemplate: "npm",
-			matchStrings: [
-				// test: https://regex101.com/r/avOpdb
-				// prettier-ignore
-				"\"npm:(?<depName>.+?)\" *= *\"(?<currentValue>.+?)\"",
-			],
-		},
-		{
-			customType: "regex",
-			description: "Updates tool versions in mise.toml (ubi, aqua backend)",
-			// prettier-ignore
-			fileMatch: ["mise\.toml"],
-			datasourceTemplate: "github-releases",
-			matchStrings: [
-				// test: https://regex101.com/r/RRA3NI
-				// prettier-ignore
-				"(?:# renovate: extractVersion=(?<extractVersion>.+?)\\n)?\"(?:ubi|aqua):(?<depName>.+?)\" *= *\".*?(?<currentValue>\\d+\\..+?)\"",
-			],
-		},
-		{
-			customType: "regex",
-			description: "Updates min_version in mise config",
-			fileMatch: ["mise\\.toml", "mise/config\\.toml"],
-			datasourceTemplate: "github-releases",
-			depNameTemplate: "mise",
-			packageNameTemplate: "jdx/mise",
-			matchStrings: [
-				// prettier-ignore
-				"min_version = \"(?<currentValue>.+)\"",
-			],
-		},
-		{
-			customType: "regex",
-			description: "Updates mise versions in GitHub Actions",
-			fileMatch: ["^\\.github/workflows/.+\\.yml$"],
-			datasourceTemplate: "github-releases",
-			depNameTemplate: "mise",
-			packageNameTemplate: "jdx/mise",
-			matchStrings: [
-				// prettier-ignore
-				"version: (?<currentValue>.+)",
-			],
-		},
-		{
-			customType: "regex",
-			description: "Updates $schema in biome.jsonc",
-			// prettier-ignore
-			fileMatch: ["biome\.jsonc"],
-			datasourceTemplate: "npm",
-			packageNameTemplate: "@biomejs/biome",
-			matchStrings: [
-				// test: https://regex101.com/r/EDnwWL
-				// prettier-ignore
-				"https:\\/\\/biomejs\\.dev\\/schemas\\/(?<currentValue>[0-9.]+)\\/schema\\.json",
-			],
-		},
-	],
+	extends: ["github>risu729/renovate-config#3.1.0"],
 	packageRules: [
-		// use unstable versions
-		{
-			// odd major versions are unstable but use the latest
-			// ref: https://docs.renovatebot.com/modules/versioning/node/
-			matchDepNames: ["node"],
-			ignoreUnstable: false,
-		},
-		// automerge
-		{
-			matchDepNames: ["mise"],
-			// cspell:ignore calver
-			// mise uses Calver, so allow automerge for all versions
-			// ref: https://mise.jdx.dev/roadmap.html#versioning
-			automerge: true,
-		},
 		// set semantic commit types
 		{
 			// override the default semanticCommitType, fix for dependencies, to chore
 			matchFileNames: ["worker/package.json"],
 			semanticCommitType: "chore",
 		},
-		{
-			matchCategories: ["ci"],
-			semanticCommitType: "ci",
-		},
 		// add labels
-		{
-			matchFileNames: ["mise.toml"],
-			addLabels: ["mise"],
-		},
 		{
 			matchFileNames: ["worker/**"],
 			addLabels: ["worker"],

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.4
           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.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -46,7 +46,7 @@ jobs:
         run: |
           tasks=$(mise tasks ls --json \
             | jq --raw-output --compact-output \
-              'map(select(.name | test("^(check:)")) | {name: (.name | sub("^.+:" ; "")), task: .name})')
+              'map(select(.name | test("^check:")) | {name: (.name | sub("^.+:" ; "")), task: .name})')
           echo "tasks=${tasks}" >> "${GITHUB_OUTPUT}"
 
   lint:
@@ -74,7 +74,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.4
           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.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
       contents: read # for checkout
 
     container:
-      image: ghcr.io/risu729/dotfiles/wsl:24.04.20241212@sha256:e9d1d55675aed4bf01aaa15503e9ad5c2af500d05a4cc3fa3e35406839359710
+      image: ghcr.io/risu729/dotfiles/wsl:24.04.20250109@sha256:13649e38dd4031a6a11e7166da6f3d23a9beec672bf67c72f9b8c542daa5ebda
 
     steps:
       - name: Run installer
@@ -37,6 +37,7 @@ jobs:
           }} | bash
         env:
           GITHUB_TOKEN: ${{ github.token }}
+          __CI: true
 
   actions-timeline:
     needs:

diff --git a/.github/workflows/worker.yml b/.github/workflows/worker.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.4
           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.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/wsl-docker.yml b/.github/workflows/wsl-docker.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2024.12.24
+          version: 2025.1.4
           # cspell:ignore kellyjonbrazil
           mise_toml: |
             [tools]
@@ -130,7 +130,7 @@ jobs:
       - name: Build and push Docker image
         id: push
         if: ${{ steps.rootfs.outcome != 'skipped' }}
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         with:
           context: .
           # create a new package if the image is not found

diff --git a/.gitignore-sync b/.gitignore-sync
@@ -1,7 +1,7 @@
 # ref: https://github.com/foray1010/ignore-sync?tab=readme-ov-file#how-to-use
 
 [oven-sh/bun]
-src/cli/gitignore-for-init
+src/cli/init/gitignore.default
 
 [inline]
 .cspellcache

diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc
@@ -5,6 +5,9 @@
 	"gitignore": true,
 	"config": {
 		// ignore line length because I don't want to wrap my text
-		"line-length": false
+		"line-length": false,
+		"no-hard-tabs": {
+			"code_blocks": false
+		}
 	}
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -41,6 +41,7 @@
 		".czrc": "jsonc",
 		"winget.json": "jsonc",
 		"gpg-agent.conf": "plaintext",
+		".tool-versions": "plaintext",
 		// match on the absolute path if / is contained
 		"**/tasks/**": "shellscript",
 		"**/wsl/etc/**": "plaintext"

diff --git a/biome.jsonc b/biome.jsonc
@@ -60,12 +60,7 @@
 		},
 		{
 			// disable noNodejsModules rule for files running in bun or Node.js
-			"include": [
-				"**/*.config.*",
-				"**/scripts/**",
-				"worker/test/**",
-				"wsl/setup-git.ts"
-			],
+			"include": ["**/*.config.*", "worker/test/**", "wsl/setup-git.ts"],
 			"linter": {
 				"rules": {
 					"correctness": {
@@ -76,7 +71,7 @@
 		},
 		{
 			// disable noConsole and useTopLevelRegex rules for scripts
-			"include": ["**/scripts/**", "wsl/setup-git.ts"],
+			"include": ["wsl/setup-git.ts"],
 			"linter": {
 				"rules": {
 					"suspicious": {