Skip to content

Commit c43a89d

Browse files
committed
Switch to emscripten 2
1 parent 2b324ec commit c43a89d

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

.github/workflows/CI.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
id: cache
1212
with:
1313
path: '.emsdk-cache'
14-
key: emscripten-1.39.20
14+
key: emscripten-2.0.6
1515
- uses: mymindstorm/setup-emsdk@2a4a91b
1616
with:
17-
version: '1.39.20'
17+
version: '2.0.6'
1818
actions-cache-folder: '.emsdk-cache'
1919
- name: make
2020
run: make

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: mymindstorm/setup-emsdk@2a4a91b
16-
with: {version: '1.39.20'}
16+
with: {version: '2.0.6'}
1717
- name: make
1818
run: make
1919
- name: Create Release

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ EMFLAGS_OPTIMIZED= \
5353
-s INLINING_LIMIT=50 \
5454
-O3 \
5555
-flto \
56-
--llvm-lto 1 \
5756
--closure 1
5857

5958
EMFLAGS_DEBUG = \

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sql.js",
3-
"version": "1.3.1",
3+
"version": "1.3.2",
44
"description": "SQLite library with support for opening and writing databases, prepared statements, and more. This SQLite library is in pure javascript (compiled with emscripten).",
55
"keywords": [
66
"sql",

src/api.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
474474
this.pos += 1;
475475
}
476476
var bytes = intArrayFromString(string);
477-
var strptr = allocate(bytes, "i8", ALLOC_NORMAL);
477+
var strptr = allocate(bytes, ALLOC_NORMAL);
478478
this.allocatedmem.push(strptr);
479479
this.db.handleError(sqlite3_bind_text(
480480
this.stmt,
@@ -491,7 +491,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
491491
pos = this.pos;
492492
this.pos += 1;
493493
}
494-
var blobptr = allocate(array, "i8", ALLOC_NORMAL);
494+
var blobptr = allocate(array, ALLOC_NORMAL);
495495
this.allocatedmem.push(blobptr);
496496
this.db.handleError(sqlite3_bind_blob(
497497
this.stmt,
@@ -983,7 +983,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
983983
if (result === null) {
984984
sqlite3_result_null(cx);
985985
} else if (result.length != null) {
986-
var blobptr = allocate(result, "i8", ALLOC_NORMAL);
986+
var blobptr = allocate(result, ALLOC_NORMAL);
987987
sqlite3_result_blob(cx, blobptr, result.length, -1);
988988
_free(blobptr);
989989
} else {

0 commit comments

Comments
 (0)