diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml deleted file mode 100644 index 60ccb45..0000000 --- a/.github/workflows/pages.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: pages - -on: - push: - branches: [main] - paths: - - "web/**" - - ".github/workflows/pages.yml" - workflow_dispatch: - -permissions: - contents: read - pages: write - id-token: write - -concurrency: - group: pages - cancel-in-progress: true - -jobs: - sanity: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: "20" - - name: Site sanity - working-directory: web - run: npm test - - deploy: - needs: sanity - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/configure-pages@v5 - - uses: actions/upload-pages-artifact@v3 - with: - path: web - - id: deployment - uses: actions/deploy-pages@v4 diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index 11c8ffc..37757d2 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -7,13 +7,11 @@ on: - "web/**" - "vercel.json" - ".github/workflows/web.yml" - - ".github/workflows/pages.yml" pull_request: paths: - "web/**" - "vercel.json" - ".github/workflows/web.yml" - - ".github/workflows/pages.yml" workflow_dispatch: jobs: diff --git a/CNAME b/CNAME deleted file mode 100644 index f51a99b..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -tomato.tmarhguy.com \ No newline at end of file diff --git a/web/CNAME b/web/CNAME deleted file mode 100644 index ea3b6d4..0000000 --- a/web/CNAME +++ /dev/null @@ -1 +0,0 @@ -tomato.tmarhguy.com diff --git a/web/README.md b/web/README.md index ee5c9f3..966497b 100644 --- a/web/README.md +++ b/web/README.md @@ -104,7 +104,6 @@ web/ ├── js/ # Engine: bench, viewer, alu emulator, forge ├── assets/pcb/alu.glb # KiCad 07_alu export (~31 MB) ├── tests/ # Custom sanity + emulator test suite -├── CNAME # tomato.tmarhguy.com └── ATTRIBUTION.md ``` @@ -132,8 +131,18 @@ cd web && npm test ## Deployment - **Live origin:** [tomato.tmarhguy.com](https://tomato.tmarhguy.com/) -- **GitHub Pages:** Publishes `web/` with `CNAME` set to `tomato.tmarhguy.com`. `.nojekyll` keeps underscored directories from being ignored. -- **Vercel:** The root `vercel.json` serves `web/` directly and runs `npm test` as the build command. Zero framework installation required. +- **Vercel:** The root `vercel.json` serves `web/` and runs `npm test` as the build. No framework, no install. +- **CI:** `.github/workflows/web.yml` runs the same sanity suite on PRs and pushes to `main`. There is no GitHub Pages workflow. + +### Custom domain DNS (Namecheap) + +Same pattern as `alu.tmarhguy.com`. In Namecheap → Domain List → `tmarhguy.com` → Advanced DNS: + +| Type | Host | Value | TTL | +|------|------|-------|-----| +| CNAME | `tomato` | `cname.vercel-dns.com.` | Automatic | + +Add `tomato.tmarhguy.com` as a domain on the Vercel project. Clear any custom domain under the repo **Settings → Pages** so GitHub stops 301ing `github.io/tomato` at a dead hostname. --- diff --git a/web/tests/site-sanity.mjs b/web/tests/site-sanity.mjs index 2b4b8fa..e7fe11c 100644 --- a/web/tests/site-sanity.mjs +++ b/web/tests/site-sanity.mjs @@ -1,6 +1,6 @@ /** * Static-site sanity for The Tomato paper. - * Pure Node — no install. Catches what breaks on GitHub Pages / Vercel: + * Pure Node — no install. Catches what breaks on Vercel / local preview: * missing assets, dead relative links, root-absolute paths, broken JS syntax, * missing deploy markers, and a local HTTP smoke of every HTML page. */