try to make CI work

oxidecomputer · May 1, 2024 · 383a9b0 · 383a9b0
1 parent e0bf5ca
commit 383a9b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -19,13 +19,16 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: "18"
-      - name: npm install
+      - working-directory: "./packages/openapi-gen-ts"
         run: npm install
       - name: Generate client
-        run: npm run gen
-      - name: TypeCheck
+        run: "./tools/gen.sh"
+      - name: Typecheck
+        working-directory: "./packages/openapi-gen-ts"
         run: npm run tsc
       - name: Lint
+        working-directory: "./packages/openapi-gen-ts"
         run: npx eslint .
       - name: Test
-        run: npm test
+        working-directory: "./packages/openapi-gen-ts"
+        run: npm test run
diff --git a/tools/gen.sh b/tools/gen.sh
@@ -19,5 +19,5 @@ SPEC_FILE="./spec.json"
 # TODO: we could get rid of this DL if a test didn't rely on it
 curl --fail "$SPEC_URL" -o $SPEC_FILE
 
-npx tsx "$ROOT_DIR/packages/openapi-gen/index.ts" $SPEC_FILE $DEST_DIR
+npx tsx "$ROOT_DIR/packages/openapi-gen-ts/src/index.ts" $SPEC_FILE $DEST_DIR
 npx prettier --write --log-level error "$DEST_DIR"