Skip to content

Commit

Permalink
Merge branch 'main' into update-lychee-config
Browse files Browse the repository at this point in the history
  • Loading branch information
risu729-pr-updater[bot] authored Jan 1, 2025
2 parents c33f034 + 4f7df84 commit f3ba6b5
Show file tree
Hide file tree
Showing 12 changed files with 92 additions and 29 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
* text=auto eol=lf
# cspell:ignore lockb
*.lockb binary diff=lockb
.gitignore linguist-generated=true
2 changes: 1 addition & 1 deletion .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
cache_save: ${{ github.ref_name == 'main' }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
cache_save: ${{ github.ref_name == 'main' }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
cache_save: ${{ github.ref_name == 'main' }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand All @@ -100,7 +100,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
cache_save: ${{ github.ref_name == 'main' }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
cache_save: ${{ github.ref_name == 'main' }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
cache_save: ${{ github.ref_name == 'main' }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wsl-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Install mise
uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
with:
version: 2024.12.22
version: 2024.12.24
# cspell:ignore kellyjonbrazil
mise_toml: |
[tools]
Expand Down
20 changes: 11 additions & 9 deletions commitlint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
import conventionalConfig from "@commitlint/config-conventional";
import type { UserConfig } from "@commitlint/types";

// exclude isBreaking, breaking, and breakingBody because this package does not have versioning
// exclude isIssueAffected, issuesBody, and issues because I link branches to issues using GitHub
const questions: string[] = [
"type",
"scope",
"subject",
"body",
const excludeQuestions: string[] = [
// exclude isBreaking, breaking, and breakingBody because this package does not have versioning
"isBreaking",
"breaking",
"breakingBody",
// exclude isIssueAffected, issuesBody, and issues because I link branches to issues using GitHub
"isIssueAffected",
"issuesBody",
"issues",
] satisfies (keyof typeof conventionalConfig.prompt.questions)[];

const commitlintConfig: UserConfig = {
Expand All @@ -18,8 +20,8 @@ const commitlintConfig: UserConfig = {
prompt: {
...conventionalConfig.prompt,
questions: Object.fromEntries(
Object.entries(conventionalConfig.prompt.questions).filter(([key]) =>
questions.includes(key),
Object.entries(conventionalConfig.prompt.questions).filter(
([key]) => !excludeQuestions.includes(key),
),
),
},
Expand Down
65 changes: 65 additions & 0 deletions github/rulesets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"name": "main",
"target": "branch",
"enforcement": "active",
"conditions": {
"ref_name": {
"exclude": [],
"include": ["~DEFAULT_BRANCH"]
}
},
"rules": [
{
"type": "deletion"
},
{
"type": "non_fast_forward"
},
{
"type": "creation"
},
{
"type": "required_linear_history"
},
{
"type": "pull_request",
"parameters": {
"required_approving_review_count": 0,
"dismiss_stale_reviews_on_push": true,
"require_code_owner_review": false,
"require_last_push_approval": false,
"required_review_thread_resolution": false,
"automatic_copilot_code_review_enabled": false,
"allowed_merge_methods": ["squash"]
}
},
{
"type": "required_status_checks",
"parameters": {
"strict_required_status_checks_policy": false,
"do_not_enforce_on_create": false,
"required_status_checks": [
{
"context": "merge-gatekeeper"
}
]
}
},
{
"type": "required_signatures"
},
{
"type": "code_scanning",
"parameters": {
"code_scanning_tools": [
{
"tool": "CodeQL",
"security_alerts_threshold": "all",
"alerts_threshold": "all"
}
]
}
}
],
"bypass_actors": []
}
8 changes: 4 additions & 4 deletions mise.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ref: https://mise.jdx.dev/configuration.html
#:schema https://mise.jdx.dev/schema/mise.json

min_version = "2024.12.22"
min_version = "2024.12.24"

[tools]
bun = "1.1.42"
Expand All @@ -20,15 +20,15 @@ actionlint = "1.7.5"
# renovate: packageName=tamasfe/taplo
taplo = "0.9.3"
"npm:prettier" = "3.4.2"
markdownlint-cli2 = "0.17.0"
markdownlint-cli2 = "0.17.1"
shfmt = "3.10.0"
shellcheck = "0.10.0"
yamlfmt = "0.14.0"
yamllint = "1.35.1"
"npm:renovate" = "39.86.1"
"npm:renovate" = "39.86.2"
"npm:cspell" = "8.17.1"
"cargo:lychee" = "0.18.0"
typos = "1.28.4"
typos = "1.29.0"
"npm:ignore-sync" = "8.0.0"

[settings]
Expand Down
4 changes: 1 addition & 3 deletions tasks.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ run = "bun run scripts/validate-json-schema.ts"

["check:actionlint"]
run = "actionlint -color"
alias = "check:actionlint"
# SC2312: check-extra-masked-returns
# pipefail is set by shell: bash in GitHub Actions but cannot be detected by shellcheck
# ref: https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#defaultsrunshell
Expand Down Expand Up @@ -80,9 +79,8 @@ run = "yamlfmt {% if env.LINT is defined %}-lint{% endif %} ."
["check:yamllint"]
run = "yamllint --strict ."

["lint:renovate"]
["check:renovate"]
run = "renovate-config-validator --strict"
alias = "check:renovate"

["check:cspell"]
run = "cspell {% if env.CI is undefined %}--cache{% endif %} \"**/*\""
Expand Down
4 changes: 2 additions & 2 deletions worker/bun.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"devDependencies": {
"@cloudflare/vitest-pool-workers": "0.5.40",
"@cloudflare/workers-types": "4.20241224.0",
"@cloudflare/workers-types": "4.20241230.0",
"@total-typescript/tsconfig": "1.0.4",
"@tsconfig/bun": "1.0.7",
"@tsconfig/strictest": "2.0.5",
Expand Down Expand Up @@ -37,7 +37,7 @@

"@cloudflare/workerd-windows-64": ["@cloudflare/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-tO1VjlvK3F6Yb2d1jgEy/QBYl//9Pyv3K0j+lq8Eu7qdfm0IgKwSRgDWLept84/qmNsQfausZ4JdNGxTf9xsxQ=="],

"@cloudflare/workers-types": ["@cloudflare/workers-types@4.20241224.0", "", {}, "sha512-1ZmFc8qqM7S/HUGmLplc4P8n8DoMqiJmc47r9Lr7VbuaotoqCXVljz09w1V1mc4K3pbFPgvqSy4XYStZ08HrlQ=="],
"@cloudflare/workers-types": ["@cloudflare/workers-types@4.20241230.0", "", {}, "sha512-dtLD4jY35Lb750cCVyO1i/eIfdZJg2Z0i+B1RYX6BVeRPlgaHx/H18ImKAkYmy0g09Ow8R2jZy3hIxMgXun0WQ=="],

"@cspotcode/source-map-support": ["@cspotcode/[email protected]", "", { "dependencies": { "@jridgewell/trace-mapping": "0.3.9" } }, "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="],

Expand Down
2 changes: 1 addition & 1 deletion worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"@cloudflare/vitest-pool-workers": "0.5.40",
"@cloudflare/workers-types": "4.20241224.0",
"@cloudflare/workers-types": "4.20241230.0",
"@total-typescript/tsconfig": "1.0.4",
"@tsconfig/bun": "1.0.7",
"@tsconfig/strictest": "2.0.5",
Expand Down
2 changes: 1 addition & 1 deletion wsl/home/.config/mise/config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ref: https://mise.jdx.dev/configuration.html#global-config-config-mise-config-toml
#:schema https://mise.jdx.dev/schema/mise.json

min_version = "2024.12.22"
min_version = "2024.12.24"

[env]
# disable bat paging
Expand Down

0 comments on commit f3ba6b5

Please sign in to comment.