clean things up

Author: tylergannon

.github/workflows/ci.yml

@@ -29,17 +29,20 @@ jobs:
 
       - uses: sqlc-dev/setup-sqlc@v4
         with:
-          sqlc-version: "1.24.0"
+          sqlc-version: "1.30.0"
 
       - name: Install dependencies
         run: bun install
 
+      - name: Lint
+        run: just lint
+
       - name: Run unit tests
-        run: bun test
+        run: just test
 
       - name: Build WASM plugin
         run: just plugin-wasm
 
-      - name: Test with sqlc
+      - name: Verify generated examples match
         run: sqlc -f sqlc.dev.yaml diff
         working-directory: examples

.github/workflows/examples.yml

@@ -5,48 +5,17 @@ on:
       - main
   pull_request:
 jobs:
-  bun-mysql:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - dir: "examples/bun-mysql2"
-            qs: "mysql"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: sqlc-dev/setup-sqlc@v4
-        with:
-          sqlc-version: "1.24.0"
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
-      - uses: shogo82148/actions-setup-mysql@v1
-        with:
-          mysql-version: "8.1"
-      - run: bun install
-        working-directory: ${{ matrix.dir }}
-      - run: mysql --user="root" --database="mysql" < schema.sql
-        working-directory: examples/authors/mysql
-      - run: bun run src/main.ts
-        working-directory: ${{ matrix.dir }}
-        env:
-          DATABASE_URL: mysql://root:@localhost:3306/mysql
-
   bun-postgresql:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - dir: "examples/bun-postgres"
-            qs: "postgresql"
           - dir: "examples/bun-pg"
-            qs: "postgresql"
+          - dir: "examples/bun-sql"
     steps:
       - uses: actions/checkout@v4
-      - uses: sqlc-dev/setup-sqlc@v4
-        with:
-          sqlc-version: "1.24.0"
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
       - uses: sqlc-dev/action-setup-postgres@master
@@ -64,47 +33,15 @@ jobs:
         env:
           DATABASE_URL: ${{ steps.postgres.outputs.connection-uri }}?sslmode=disable
 
-  node-mysql:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - dir: "examples/node-mysql2"
-            qs: "mysql"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: sqlc-dev/setup-sqlc@v4
-        with:
-          sqlc-version: "1.24.0"
-      - uses: actions/setup-node@v4
-      - uses: shogo82148/actions-setup-mysql@v1
-        with:
-          mysql-version: "8.1"
-      - run: npm install
-        working-directory: ${{ matrix.dir }}
-      - run: npx tsc
-        working-directory: ${{ matrix.dir }}
-      - run: mysql --user="root" --database="mysql" < schema.sql
-        working-directory: examples/authors/mysql
-      - run: node ./src/main.js
-        working-directory: ${{ matrix.dir }}
-        env:
-          DATABASE_URL: mysql://root:@localhost:3306/mysql
-
   node-postgresql:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - dir: "examples/node-postgres"
-            qs: "postgresql"
           - dir: "examples/node-pg"
-            qs: "postgresql"
     steps:
       - uses: actions/checkout@v4
-      - uses: sqlc-dev/setup-sqlc@v4
-        with:
-          sqlc-version: "1.24.0"
       - uses: actions/setup-node@v4
       - uses: sqlc-dev/action-setup-postgres@master
         with:

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
         run: bun install
 
       - name: Run unit tests
-        run: bun test
+        run: just test
 
       - name: Build WASM plugin
         run: just plugin-wasm && mv examples/plugin.wasm sqlc-gen-typescript.wasm

Justfile

@@ -3,14 +3,20 @@ generate: plugin-wasm
     cd examples && sqlc-dev -f sqlc.dev.yaml generate
 
 # Compile JavaScript to WASM using javy
-
 # https://github.com/bytecodealliance/javy
+
+# Set JAVY_PATH to the directory containing javy if not in system PATH
 plugin-wasm: out-js
-    javy build out.js -o examples/plugin.wasm
+    #!/usr/bin/env bash
+    JAVY=javy
+    if [ -n "$JAVY_PATH" ]; then
+        JAVY="$JAVY_PATH/javy"
+    fi
+    $JAVY build out.js -o examples/plugin.wasm
 
 # Bundle TypeScript to JavaScript using rolldown
 out-js: codegen-proto
-    bun run rolldown -c rolldown.config.js
+    bun run rolldown -c rolldown.config.ts
 
 # Generate protobuf code using buf
 codegen-proto: lint