Restore windows tests + pin version to 'windows-2019' (#301)

edgedb · Mar 16, 2022 · b505c59 · b505c59
1 parent 7be3ab3
commit b505c59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
           submodules: true
 
       - name: Setup WSL
-        if: ${{ matrix.os == 'windows-latest' }}
+        if: ${{ matrix.os == 'windows-2019' }}
         uses: vampire/setup-wsl@v1
         with:
           wsl-shell-user: edgedb

diff --git a/qb/test/esm.test.mjs b/qb/test/esm.test.mjs
@@ -1,11 +1,8 @@
 import path from "path";
-import {fileURLToPath} from "url";
-import fs from "fs";
 import {execSync} from "child_process";
 import {createClient} from "edgedb";
 
-const __dirname = fileURLToPath(import.meta.url);
-const QBDIR = path.resolve(__dirname, "../../dbschema/qbout");
+const QBDIR = "../dbschema/qbout";
 
 const client = createClient();
 
@@ -24,7 +21,7 @@ async function run() {
       return;
     }
     execSync(CMD.join(" "));
-    const indexFilePath = path.resolve(QBDIR, "index.mjs");
+    const indexFilePath = path.posix.join(QBDIR, "index.mjs");
     const {default: e} = await import(indexFilePath);
     const result = await e.str("Hello world!").run(client);
     if (result !== "Hello world!") throw new Error();