From: Simon Cozens <simon@simon-cozens.org>
Date: Wed, 2 Apr 2025 10:36:48 +0000 (+0100)
Subject: Find database in correct location
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9295%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git

Find database in correct location
---

diff --git a/.ci/fontspector-dashboard/src/results.json.js b/.ci/fontspector-dashboard/src/results.json.js
index 3c2a08a9e..2d52f54ae 100644
--- a/.ci/fontspector-dashboard/src/results.json.js
+++ b/.ci/fontspector-dashboard/src/results.json.js
@@ -1,6 +1,6 @@
 import { DuckDBInstance } from "@duckdb/node-api";
 
-const instance = await DuckDBInstance.create("./src/fontspector.db");
+const instance = await DuckDBInstance.create("../../fontspector.db");
 const db = await instance.connect();
 
 const reader = await db.runAndReadAll(
diff --git a/.github/workflows/fontspectorall.yaml b/.github/workflows/fontspectorall.yaml
index 0614d5a1a..6cabf74ef 100644
--- a/.github/workflows/fontspectorall.yaml
+++ b/.github/workflows/fontspectorall.yaml
@@ -13,7 +13,7 @@ jobs:
           ref: main
           lfs: true
       - name: Grab fontspector database
-        run: git fetch origin gh-pages; git checkout gh-pages; cp fontspector-dashboard/fontspector.db .ci/fontspector-dashboard/src/fontspector.db || true; git checkout main
+        run: git fetch origin gh-pages; git checkout gh-pages; cp fontspector-dashboard/fontspector.db . ; git checkout main
       - name: Install protoc
         run: brew install protobuf
       - name: Install Rust
@@ -21,9 +21,11 @@ jobs:
       - name: Build fontspector
         run: cargo install --git https://github.com/fonttools/fontspector --features duckdb
       - name: Test all the things
-        run: fontspector --profile googlefonts ofl/*/*{.ttf,.pb,*html,*svg,*jpg,*gif} --skip-network --succinct --duckdb .ci/fontspector-dashboard/src/fontspector.db || true
+        run: fontspector --profile googlefonts ofl/*/*{.ttf,.pb,*html,*svg,*jpg,*gif} --skip-network --succinct --duckdb fontspector.db || true
       - name: Build dashboard
-        run: cd .ci/fontspector-dashboard && npm install && npm run build && cp src/fontspector.db ../../fontspector-dashboard-build/
+        run: cd .ci/fontspector-dashboard && npm install && npm run build
+      - name: Stash database again
+        run: cp fontspector.db fontspector-dashboard-build/
       - name: Add to branch
         run: git checkout gh-pages; git rm -rf fontspector-dashboard || true; rm -rf fontspector-dashboard || true; mv fontspector-dashboard-build fontspector-dashboard
       - name: Upload results