diff --git a/.github/dependency-policy.json b/.github/dependency-policy.json index 65b693c..f3023cf 100644 --- a/.github/dependency-policy.json +++ b/.github/dependency-policy.json @@ -11,7 +11,8 @@ "managed_dependencies": [ "aviorstudio/gdam-actions/*", "nicodes/komizo-actions/*", - "nicodes/komizo/*" + "nicodes/komizo/*", + "nicodes/tools/*" ], "sensitive_dependencies": [ "*clerk*", 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 60caf6c..b34d630 100644 --- a/.github/readme-source.json +++ b/.github/readme-source.json @@ -1,6 +1,6 @@ { "version": 1, - "sha256": "159dc807a6476bc6b1f199e3020f4ec2d9ceb0dd702ea8596bd68cbb3a9009b5", + "sha256": "822863534d7cc7a9531e96553b9087866095706c77325fd55f322404557fac9c", "history": { "forbidden_commits": [ "5e7eba20575e7194b6cb91a498f3a69d35e1e786" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd03a6a..0cb4863 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,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 @@ -35,10 +35,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 @@ -49,6 +46,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 1fd9223..7f40c2c 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 558020f..af07cf9 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ - + # fieldsofrevik-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 4bc2ea5..0000000 --- a/komizo.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": 1, - "recipe": "static-site", - "repository": "aviorstudio/fieldsofrevik-web", - "validation": { - "workflow": { - "required": [ - "ci.yml", - "dependency-policy.yml" - ], - "ci_gates": [ - "Test" - ] - } - } -} diff --git a/komizo.lock b/komizo.lock deleted file mode 100644 index 25e43b0..0000000 --- a/komizo.lock +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": 1, - "platform": "0.2.7", - "platform_revision": "1b740f28682948a2d5eb4613744bb262d2056e6c", - "manifest_sha256": "65025749be58a049eacdcb50caf62fdfdec91c7bc73608244d33fa4c5ae28ed6", - "runtime_sha256": "e85ed5057a15b6432600b5596aacbc967179122757378b61dc4247a101db8f9b", - "recipe_sha256": "e519f5bc5d0100fcfe922762ea2a440ef09f1b45b4f25dc3488f14f3638ee2a6" -} diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..90ad02c --- /dev/null +++ b/mise.toml @@ -0,0 +1,28 @@ +[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 = ["bash scripts/test-site.sh"] +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."check"] +run = [{"task" = "install"}, {"task" = "build"}, {"task" = "artifact-check"}]