Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile COI bundle with Emscripten 3.1.67 #1876

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Compile COI bundle with Emscripten 3.1.67 #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c839171
Revert "Remove worker.pthread.hs"
carlopi Oct 4, 2024
f325404
Lock EMSCRIPTEN_VERSION for COI bundle at 3.1.67
carlopi Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ concurrency:

env:
EMSCRIPTEN_VERSION: 'latest'
EMSCRIPTEN_VERSION_COI: '3.1.67'

jobs:
clang_format:
Expand Down Expand Up @@ -456,7 +457,7 @@ jobs:

- uses: mymindstorm/setup-emsdk@v14
with:
version: ${{ env.EMSCRIPTEN_VERSION }}
version: ${{ env.EMSCRIPTEN_VERSION_COI }}

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
Expand Down Expand Up @@ -586,7 +587,7 @@ jobs:

- uses: mymindstorm/setup-emsdk@v14
with:
version: ${{ env.EMSCRIPTEN_VERSION }}
version: ${{ env.EMSCRIPTEN_VERSION_COI }}

- name: Setup Ccache
uses: hendrikmuhs/ccache-action@main
Expand Down
2 changes: 1 addition & 1 deletion packages/duckdb-wasm-app/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const DUCKDB_BUNDLES: duckdb.DuckDBBundles = {
mainModule: duckdb_wasm_coi,
mainWorker: new URL('@duckdb/duckdb-wasm/dist/duckdb-browser-coi.worker.js', import.meta.url).toString(),
pthreadWorker: new URL(
'@duckdb/duckdb-wasm/dist/duckdb-browser-coi.worker.js',
'@duckdb/duckdb-wasm/dist/duckdb-browser-coi.pthread.worker.js',
import.meta.url,
).toString(),
},
Expand Down
6 changes: 3 additions & 3 deletions packages/duckdb-wasm/bundle.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist,
patchFile('./src/bindings/duckdb-mvp.js', 'child_process');
patchFile('./src/bindings/duckdb-eh.js', 'child_process');
patchFile('./src/bindings/duckdb-coi.js', 'child_process');
// patchFile('./src/bindings/duckdb-coi.pthread.js', 'vm');
patchFile('./src/bindings/duckdb-coi.pthread.js', 'vm');

// -------------------------------
// Browser bundles
Expand Down Expand Up @@ -216,7 +216,7 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist,
external: EXTERNALS_WEBWORKER,
define: { 'process.release.name': '"browser"' },
});
/*

console.log('[ ESBUILD ] duckdb-browser-coi.pthread.worker.js');
await esbuild.build({
entryPoints: ['./src/targets/duckdb-browser-coi.pthread.worker.ts'],
Expand All @@ -230,7 +230,7 @@ fs.copyFile(path.resolve(src, 'bindings', 'duckdb-coi.wasm'), path.resolve(dist,
external: EXTERNALS_WEBWORKER,
define: { 'process.release.name': '"browser"' },
});
*/

// -------------------------------
// Node bundles

Expand Down
2 changes: 1 addition & 1 deletion packages/duckdb-wasm/test/index_browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const DUCKDB_BUNDLES: duckdb.DuckDBBundles = {
coi: {
mainModule: new URL('/static/duckdb-coi.wasm', window.location.href).href,
mainWorker: new URL('/static/duckdb-browser-coi.worker.js', window.location.href).href,
pthreadWorker: new URL('/static/duckdb-browser-coi.worker.js', window.location.href).href,
pthreadWorker: new URL('/static/duckdb-browser-coi.pthread.worker.js', window.location.href).href,
},
};
let DUCKDB_BUNDLE: duckdb.DuckDBBundle | null = null;
Expand Down