Reenable verification builds and fix Windows bugs

Author: rianadon

.github/workflows/push-checks.yaml

@@ -10,7 +10,7 @@ jobs:
       - name: Build the Dockerfile
         run: docker compose build
   openscad-node:
-    name: Verify that OpenSCAD keycap scripts work (Node.js)
+    name: Verify that OpenSCAD keycap scripts work (Node/Linux)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -52,55 +52,49 @@ jobs:
       - name: Build simple keycaps
         run: OPENSCAD=$(which openscad) make keycaps-simple
 
-  # setup-linux-bun:
-  #   name: Verify Set up (Bun/Linux)
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v6
-
-  #     - uses: oven-sh/setup-bun@v2
-
-  #     - name: Quickstart
-  #       # Give the process 3 chances to work
-  #       run: make quickstart || make quickstart || make quickstart
-
-  # setup-windows-bun:
-  #   name: Verify Set up (Bun/Windows)
-  #   runs-on: windows-latest
-  #   steps:
-  #     - uses: actions/checkout@v6
+  setup-linux-bun:
+    name: Verify Set up (Bun/Linux)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
 
-  #     - uses: oven-sh/setup-bun@v1
-  #       with:
-  #         bun-version: latest
+      - uses: oven-sh/setup-bun@v2
 
-  #     - name: Install npm dependencies
-  #       run: bun install
+      - name: Quickstart
+        run: make quickstart
+        env:
+          SKIP_VARIANTS: 1
 
-  #     - name: Install make
-  #       run: choco install make
+  setup-windows-bun:
+    name: Verify Set up (Bun/Windows)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
 
-  #     - name: Quickstart
-  #       run: make quickstart
+      - uses: oven-sh/setup-bun@v2
 
-  # setup-node-bun:
-  #   name: Verify Set up (Node/Windows)
-  #   runs-on: windows-latest
-  #   steps:
-  #     - uses: actions/checkout@v6
+      - name: Install npm dependencies
+        run: bun install
 
-  #     - uses: actions/setup-node@v6
-  #       with:
-  #         node-version: 24
+      - name: Quickstart
+        run: bun make quickstart
+        env:
+          SKIP_VARIANTS: 1
 
-  #     - name: Install npm dependencies
-  #       run: npm install
+  setup-node-bun:
+    name: Verify Set up (Node/Windows)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
 
-  #     - name: Install make
-  #       run: choco install make
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
 
-  #     - name: Parts
-  #       run: make ci-setup parts
+      - name: Install npm dependencies
+        run: npm install
 
-  #     - name: Quickstart
-  #       run: make quickstart
+      - name: Quickstart
+        run: npm run nodemake quickstart
+        env:
+          SKIP_VARIANTS: 1

package.json

@@ -12,8 +12,8 @@
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
     "test": "bun test",
     "prepare": "npx simple-git-hooks",
-    "make": "bun src/scripts/mini-make.ts",
-    "nodemake": "node --import ./src/model_gen/register_loader.js src/scripts/mini-make.ts"
+    "make": "bun src/scripts/mini-make.js",
+    "nodemake": "node src/scripts/mini-make.js"
   },
   "dependencies": {
     "@mdi/js": "^7.4.47",

src/model_gen/parts.ts

@@ -312,19 +312,22 @@ async function main() {
     trackpadRounding: 2,
   }, { size: '57x80' })
 
-  // Make all combinations of trackballs
-  const trackballCode = fileURLToPath(new URL('./parametric/trackball-gen.ts', import.meta.url))
-  for (const v of allVariants('trackball') as TrackballVariant[]) {
-    const url = variantURL({ type: 'trackball', variant: v } as any)
-    const stepName = join(targetDir, `key-trackball${url}.step`.toLowerCase())
-    const glbName = join(targetDir, `switch-trackball${url}.glb`.toLowerCase())
-    pool.addIfModified(`${v.size} trackball, ${v.bearings}, ${v.sensor}`, stepName, [trackballCode], async () => {
-      await writeModel(stepName, trackballSocket({ diameter: parseFloat(v.size), bearings: v.bearings, sensor: v.sensor }))
-    })
-    if (v.bearings == 'BTU (7.5mm)' || v.bearings == 'BTU (9mm)') {
-      pool.addIfModified(`${v.size} trackball BTU Part, ${v.bearings}, ${v.sensor}`, glbName, [trackballCode], async () => {
-        await writeMesh(glbName, trackballPart({ diameter: parseFloat(v.size), bearings: v.bearings, sensor: v.sensor }))
+  // Variants take a very long time, so CI skips them for OS checks
+  if (!process.env.SKIP_VARIANTS) {
+    // Make all combinations of trackballs
+    const trackballCode = fileURLToPath(new URL('./parametric/trackball-gen.ts', import.meta.url))
+    for (const v of allVariants('trackball') as TrackballVariant[]) {
+      const url = variantURL({ type: 'trackball', variant: v } as any)
+      const stepName = join(targetDir, `key-trackball${url}.step`.toLowerCase())
+      const glbName = join(targetDir, `switch-trackball${url}.glb`.toLowerCase())
+      pool.addIfModified(`${v.size} trackball, ${v.bearings}, ${v.sensor}`, stepName, [trackballCode], async () => {
+        await writeModel(stepName, trackballSocket({ diameter: parseFloat(v.size), bearings: v.bearings, sensor: v.sensor }))
       })
+      if (v.bearings == 'BTU (7.5mm)' || v.bearings == 'BTU (9mm)') {
+        pool.addIfModified(`${v.size} trackball BTU Part, ${v.bearings}, ${v.sensor}`, glbName, [trackballCode], async () => {
+          await writeMesh(glbName, trackballPart({ diameter: parseFloat(v.size), bearings: v.bearings, sensor: v.sensor }))
+        })
+      }
     }
   }