From 9b0defe2d38705e92d1d8680d4c267489a45c79f Mon Sep 17 00:00:00 2001 From: nicodes Date: Fri, 30 Oct 2026 08:59:16 +0100 Subject: [PATCH 1/2] Run project verification independently of deployment tooling --- .github/dependency-policy.json | 11 +++++++-- .github/komizo-action-source.json | 5 ---- .github/readme-source.json | 6 +++-- .github/workflows/ci.yml | 16 ++++++------- .github/workflows/dependency-policy.yml | 14 +++++------ .gitignore | 5 +--- README.md | 12 +++++----- komizo.json | 15 ------------ komizo.lock | 8 ------- mise.toml | 31 +++++++++++++++++++++++++ 10 files changed, 64 insertions(+), 59 deletions(-) delete mode 100644 .github/komizo-action-source.json delete mode 100644 komizo.json delete mode 100644 komizo.lock create mode 100644 mise.toml diff --git a/.github/dependency-policy.json b/.github/dependency-policy.json index bf12ae4..f3023cf 100644 --- a/.github/dependency-policy.json +++ b/.github/dependency-policy.json @@ -2,11 +2,18 @@ "version": 1, "mode": "auto", "ci_workflow": "ci.yml", - "required_checks": ["Test"], + "required_checks": [ + "Test" + ], "integration_job": "ci", "dispatch_workflow": "ci.yml", "max_group_size": 10, - "managed_dependencies": ["aviorstudio/gdam-actions/*", "nicodes/komizo-actions/*", "nicodes/komizo/*"], + "managed_dependencies": [ + "aviorstudio/gdam-actions/*", + "nicodes/komizo-actions/*", + "nicodes/komizo/*", + "nicodes/tools/*" + ], "sensitive_dependencies": [ "*clerk*", "*pocketbase*", diff --git a/.github/komizo-action-source.json b/.github/komizo-action-source.json deleted file mode 100644 index 34636a1..0000000 --- a/.github/komizo-action-source.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 1, - "platform_revision": "1b740f28682948a2d5eb4613744bb262d2056e6c", - "action_revision": "2ca94e2fd4bb05f41bb228e9c366e5cc733c75e6" -} diff --git a/.github/readme-source.json b/.github/readme-source.json index 9cad48b..5856f32 100644 --- a/.github/readme-source.json +++ b/.github/readme-source.json @@ -1,7 +1,9 @@ { "version": 1, - "sha256": "c35a63a402592887a7ff1f8a18757a680c945ffa09432bc84555737455defb82", + "sha256": "295a1a40e9463136319dce8c110fba77f4a7b5d9f3723798132cef1bf9e54e8b", "history": { - "forbidden_commits": ["ec050dfdfec522d814f1e1e8eb1c7aaf42e880be"] + "forbidden_commits": [ + "ec050dfdfec522d814f1e1e8eb1c7aaf42e880be" + ] } } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 007987b..0d3f1ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,8 +28,8 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 with: persist-credentials: false - - name: Set up locked komizo - uses: nicodes/komizo/setup@2ca94e2fd4bb05f41bb228e9c366e5cc733c75e6 + - name: Set up development tools + uses: nicodes/tools/setup@7dd151b7c2cac851d46591cad4a14d74d923dd77 env: GH_TOKEN: ${{ github.token }} timeout-minutes: 5 @@ -37,10 +37,7 @@ jobs: if: github.event_name == 'pull_request' env: EXPECTED_HEAD: ${{ github.event.pull_request.head.sha }} - run: | - komizo exec --tools python -- bash -euo pipefail <<'KOMIZO_COMMAND' - python3 "$CICD_ENGINEERING/helpers/integration-identity.py" - KOMIZO_COMMAND + run: python3 "$TOOLS_ROOT/helpers/integration-identity.py" - name: Upload artifacts if: github.event_name == 'pull_request' uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 @@ -51,6 +48,7 @@ jobs: retention-days: 7 include-hidden-files: true - name: Check project - uses: nicodes/komizo/run@2ca94e2fd4bb05f41bb228e9c366e5cc733c75e6 - with: - target: check + shell: bash + run: |- + set -euo pipefail + mise run check diff --git a/.github/workflows/dependency-policy.yml b/.github/workflows/dependency-policy.yml index 5abe8b7..a207c79 100644 --- a/.github/workflows/dependency-policy.yml +++ b/.github/workflows/dependency-policy.yml @@ -26,8 +26,8 @@ concurrency: jobs: auto-merge: name: Apply dependency policy - if: github.ref == 'refs/heads/main' && (github.event_name != 'pull_request_target' || (github.event.pull_request.user.login == 'dependabot[bot]' - && github.event.pull_request.draft == false)) + if: github.ref == 'refs/heads/main' && (github.event_name != 'pull_request_target' || (github.event.pull_request.user.login + == 'dependabot[bot]' && github.event.pull_request.draft == false)) runs-on: ubuntu-24.04 timeout-minutes: 15 permissions: @@ -44,16 +44,14 @@ jobs: persist-credentials: false ref: main timeout-minutes: 3 - - name: Set up locked komizo - uses: nicodes/komizo/setup@2ca94e2fd4bb05f41bb228e9c366e5cc733c75e6 - env: - GH_TOKEN: ${{ github.token }} - timeout-minutes: 5 - name: Reconcile verified dependency updates - run: komizo dependencies apply --output "$RUNNER_TEMP/dependency-report.json" env: GH_TOKEN: ${{ github.token }} timeout-minutes: 7 + uses: nicodes/tools/dependencies@7dd151b7c2cac851d46591cad4a14d74d923dd77 + with: + apply: 'true' + output: ${{ runner.temp }}/dependency-report.json - name: Upload artifacts if: always() uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 diff --git a/.gitignore b/.gitignore index b0ea528..e68a0df 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,4 @@ pnpm-debug.log* # Generated CI evidence .artifacts/ - -.komizo.mise*.toml - -.komizo.mise*.lock +/.ci-tools/ diff --git a/README.md b/README.md index f919ab3..8dcb5dc 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ - + # aviorstudio-web Static website built with Astro. -Install the [komizo release](https://github.com/nicodes/komizo#install) matching `komizo.lock`, then run: +Install [mise](https://mise.jdx.dev/) and run `mise install`, then run: ```sh -komizo dev # Foreground development server -komizo check # Complete applicable source, build and output checks -komizo run build # Generate dist/ -komizo describe # Inspect tools and available commands +mise run dev # Development server +mise run check # Complete applicable source, build and output checks +mise run build # Generate dist/ +mise tasks ls # Inspect tools and available commands ``` Ctrl-C stops development. This website needs no runtime credentials or credential `.env` file. diff --git a/komizo.json b/komizo.json deleted file mode 100644 index 60d6ca0..0000000 --- a/komizo.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 1, - "recipe": "static-site", - "repository": "aviorstudio/aviorstudio-web", - "stages": { - "lint": [["bun", "x", "--no-install", "biome", "check"], ["bun", "run", "typecheck"]], - "artifact-check": [["python3", "scripts/check-output.py"]] - }, - "validation": { - "workflow": { - "required": ["ci.yml", "dependency-policy.yml"], - "ci_gates": ["Test"] - } - } -} diff --git a/komizo.lock b/komizo.lock deleted file mode 100644 index 6c8ab83..0000000 --- a/komizo.lock +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 1, - "platform": "0.2.7", - "platform_revision": "1b740f28682948a2d5eb4613744bb262d2056e6c", - "manifest_sha256": "f423c922c0fbb80f29afe5392a648f05cb1a35c8756460ce6eea44ed9218e64c", - "runtime_sha256": "e85ed5057a15b6432600b5596aacbc967179122757378b61dc4247a101db8f9b", - "recipe_sha256": "e519f5bc5d0100fcfe922762ea2a440ef09f1b45b4f25dc3488f14f3638ee2a6" -} diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..97f09c0 --- /dev/null +++ b/mise.toml @@ -0,0 +1,31 @@ +[tools] +"python" = "3.13.11" +"bun" = "1.4.1" +"node" = "24.18.1" + +[env] +TOOLS_ROOT = "{{ get_env(name='TOOLS_ROOT', default=config_root ~ '/.ci-tools') }}" +GOTOOLCHAIN = "local" +PYTHONDONTWRITEBYTECODE = "1" + +[tasks."install"] +run = ["bun install --frozen-lockfile"] + +[tasks."build"] +run = ["bun run build"] + +[tasks."artifact-check"] +run = ["python3 scripts/check-output.py"] +depends = ["build"] + +[tasks."dev"] +run = ["bun run dev"] + +[tasks."clean"] +run = ["bun -e 'const fs=require('\"'\"'node:fs'\"'\"');for(const p of ['\"'\"'dist'\"'\"','\"'\"'.astro'\"'\"'])fs.rmSync(p,{recursive:true,force:true})'"] + +[tasks."lint"] +run = ["bun x --no-install biome check", "bun run typecheck"] + +[tasks."check"] +run = [{"task" = "install"}, {"task" = "lint"}, {"task" = "build"}, {"task" = "artifact-check"}] From f6e4c43677d9aeac3083193b7c4aae8add9a14bc Mon Sep 17 00:00:00 2001 From: nicodes Date: Fri, 30 Oct 2026 09:12:39 +0100 Subject: [PATCH 2/2] Preserve the repository JSON formatting conventions --- .github/dependency-policy.json | 4 +--- .github/readme-source.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/dependency-policy.json b/.github/dependency-policy.json index f3023cf..336ebed 100644 --- a/.github/dependency-policy.json +++ b/.github/dependency-policy.json @@ -2,9 +2,7 @@ "version": 1, "mode": "auto", "ci_workflow": "ci.yml", - "required_checks": [ - "Test" - ], + "required_checks": ["Test"], "integration_job": "ci", "dispatch_workflow": "ci.yml", "max_group_size": 10, diff --git a/.github/readme-source.json b/.github/readme-source.json index 5856f32..578e038 100644 --- a/.github/readme-source.json +++ b/.github/readme-source.json @@ -2,8 +2,6 @@ "version": 1, "sha256": "295a1a40e9463136319dce8c110fba77f4a7b5d9f3723798132cef1bf9e54e8b", "history": { - "forbidden_commits": [ - "ec050dfdfec522d814f1e1e8eb1c7aaf42e880be" - ] + "forbidden_commits": ["ec050dfdfec522d814f1e1e8eb1c7aaf42e880be"] } }