From a5fbcb11e5578c7979c7c32d2fa124d029defbc5 Mon Sep 17 00:00:00 2001 From: Nikita Sivukhin Date: Fri, 12 Sep 2025 15:39:38 +0400 Subject: [PATCH] fix CI --- .github/workflows/napi.yml | 7 ++++++- bindings/javascript/packages/browser/package.json | 6 +++--- bindings/javascript/sync/packages/browser/package.json | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/napi.yml b/.github/workflows/napi.yml index bc187c3d9..68a0cae3b 100644 --- a/.github/workflows/napi.yml +++ b/.github/workflows/napi.yml @@ -76,6 +76,8 @@ jobs: export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) export TARGET_CXXFLAGS="--target=wasm32-wasi-threads --sysroot=$(pwd)/wasi-sdk-25.0-x86_64-linux/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp" export TARGET_CFLAGS="$TARGET_CXXFLAGS" + yarn workspace @tursodatabase/database-common build + yarn workspace @tursodatabase/database-browser-common build yarn workspace @tursodatabase/database-browser build - host: ubuntu-latest target: wasm32-wasip1-threads @@ -89,8 +91,11 @@ jobs: export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) export TARGET_CXXFLAGS="--target=wasm32-wasi-threads --sysroot=$(pwd)/wasi-sdk-25.0-x86_64-linux/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp" export TARGET_CFLAGS="$TARGET_CXXFLAGS" + yarn workspace @tursodatabase/database-common build + yarn workspace @tursodatabase/database-browser-common build + yarn workspace @tursodatabase/sync-common build yarn workspace @tursodatabase/sync-browser build - name: stable - ${{ matrix.settings.target }} - node@20 + name: ${{ matrix.settings.artifact }} - node@20 runs-on: ${{ matrix.settings.host }} steps: - uses: actions/checkout@v4 diff --git a/bindings/javascript/packages/browser/package.json b/bindings/javascript/packages/browser/package.json index 0fb316a1a..03dc7c1db 100644 --- a/bindings/javascript/packages/browser/package.json +++ b/bindings/javascript/packages/browser/package.json @@ -39,9 +39,9 @@ }, "scripts": { "napi-build": "napi build --features browser --release --platform --target wasm32-wasip1-threads --no-js --manifest-path ../../Cargo.toml --output-dir . && rm index.d.ts turso.wasi* wasi* browser.js", - "tsc-build": "npm exec tsc && cp turso.wasm32-wasi.wasm ./dist/turso.wasm32-wasi.wasm && WASM_FILE=turso.wasm32-wasi.wasm JS_FILE=./dist/wasm-inline.js node ../../scripts/inline-wasm-base64.js", + "tsc-build": "npm exec tsc && cp turso.wasm32-wasi.wasm ./dist/turso.wasm32-wasi.wasm && WASM_FILE=turso.wasm32-wasi.wasm JS_FILE=./dist/wasm-inline.js node ../../scripts/inline-wasm-base64.js && npm run bundle", "bundle": "vite build", - "build": "npm run napi-build && npm run tsc-build && npm run bundle", + "build": "npm run napi-build && npm run tsc-build", "test": "CI=1 vitest --browser=chromium --run && CI=1 vitest --browser=firefox --run" }, "napi": { @@ -54,4 +54,4 @@ "@tursodatabase/database-browser-common": "^0.2.0-pre.1", "@tursodatabase/database-common": "^0.2.0-pre.1" } -} +} \ No newline at end of file diff --git a/bindings/javascript/sync/packages/browser/package.json b/bindings/javascript/sync/packages/browser/package.json index 6d4511396..8180aa1fa 100644 --- a/bindings/javascript/sync/packages/browser/package.json +++ b/bindings/javascript/sync/packages/browser/package.json @@ -39,9 +39,9 @@ }, "scripts": { "napi-build": "napi build --features browser --release --platform --target wasm32-wasip1-threads --no-js --manifest-path ../../Cargo.toml --output-dir . && rm index.d.ts sync.wasi* wasi* browser.js", - "tsc-build": "npm exec tsc && cp sync.wasm32-wasi.wasm ./dist/sync.wasm32-wasi.wasm && WASM_FILE=sync.wasm32-wasi.wasm JS_FILE=./dist/wasm-inline.js node ../../../scripts/inline-wasm-base64.js", + "tsc-build": "npm exec tsc && cp sync.wasm32-wasi.wasm ./dist/sync.wasm32-wasi.wasm && WASM_FILE=sync.wasm32-wasi.wasm JS_FILE=./dist/wasm-inline.js node ../../../scripts/inline-wasm-base64.js && npm run bundle", "bundle": "vite build", - "build": "npm run napi-build && npm run tsc-build && npm run bundle", + "build": "npm run napi-build && npm run tsc-build", "test": "VITE_TURSO_DB_URL=http://b--a--a.localhost:10000 CI=1 vitest --browser=chromium --run && VITE_TURSO_DB_URL=http://b--a--a.localhost:10000 CI=1 vitest --browser=firefox --run" }, "napi": { @@ -58,4 +58,4 @@ "@tursodatabase/database-common": "^0.2.0-pre.1", "@tursodatabase/sync-common": "^0.2.0-pre.1" } -} +} \ No newline at end of file