Skip to content

Commit f1bda0c

Browse files
committed
chore: Merge pull request #301 from GordonSmith/BUMP_VERSIONS
chore: Bump versions
2 parents 2c9dd8b + 71cd652 commit f1bda0c

File tree

9 files changed

+1682
-1408
lines changed

9 files changed

+1682
-1408
lines changed

.github/workflows/test-pr.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ env:
55

66
on:
77
pull_request:
8+
push:
89

910
jobs:
1011
build:
1112
strategy:
1213
fail-fast: false
1314
matrix:
1415
os: [ubuntu-24.04, macos-13, macos-14]
15-
node: [18, 20, 22]
16+
node: [20, 22]
1617

1718
runs-on: ${{ matrix.os }}
1819
name: Node ${{ matrix.os }}, node-${{ matrix.node }} sample

CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set(EM_LINK_FLAGS
2727
# "-sSTANDALONE_WASM=0"
2828
# "-sBINARYEN_ASYNC_COMPILATION=1"
2929
# "-sDYNAMIC_EXECUTION=0"
30+
"-sWASM_BIGINT=0"
3031
"-sPOLYFILL=0"
3132
# "-sSTRICT=0"
3233
"-sIGNORE_MISSING_MAIN=0"
@@ -45,7 +46,6 @@ set(EM_LINK_FLAGS
4546
if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
4647
set(EM_LINK_FLAGS
4748
${EM_LINK_FLAGS}
48-
"-sUSE_ES6_IMPORT_META=1"
4949
"-gsource-map"
5050
"--source-map-base ./" # Debugging c++ only works in browser with "Experimental DWARF support turned on"
5151
)
@@ -65,7 +65,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebIn
6565
else ()
6666
set(EM_LINK_FLAGS
6767
${EM_LINK_FLAGS}
68-
"-sUSE_ES6_IMPORT_META=0"
6968
)
7069
endif ()
7170

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# @hpcc-js/wasm - Version 3
22

3-
![Tests](https://github.com/hpcc-systems/hpcc-js-wasm/workflows/Test%20PR/badge.svg)
4-
[![Coverage Status](https://coveralls.io/repos/github/GordonSmith/hpcc-js-wasm/badge.svg?branch=BUMP_VERSIONS)](https://coveralls.io/github/GordonSmith/hpcc-js-wasm?branch=BUMP_VERSIONS)
3+
[![Test PR](https://github.com/hpcc-systems/hpcc-js-wasm/actions/workflows/test-pr.yml/badge.svg)](https://github.com/hpcc-systems/hpcc-js-wasm/actions/workflows/test-pr.yml)
4+
[![release-please](https://github.com/hpcc-systems/hpcc-js-wasm/actions/workflows/release-please.yml/badge.svg)](https://github.com/hpcc-systems/hpcc-js-wasm/actions/workflows/release-please.yml)
5+
[![Coverage Status](https://coveralls.io/repos/github/hpcc-systems/hpcc-js-wasm/badge.svg?branch=BUMP_VERSIONS)](https://coveralls.io/github/GordonSmith/hpcc-js-wasm?branch=BUMP_VERSIONS)
56

67
This repository contains a collection of useful c++ libraries compiled to WASM for (re)use in Node JS, Web Browsers and JavaScript Libraries:
78
- [base91](https://base91.sourceforge.net/) - v0.6.0
@@ -13,7 +14,7 @@ This repository contains a collection of useful c++ libraries compiled to WASM f
1314
- ...more to follow...
1415

1516
Built with:
16-
- [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.73
17+
- [emsdk](https://github.com/emscripten-core/emsdk) - v4.0.5
1718

1819
## Homepage and Documents
1920

docker/ubuntu-dev.dockerfile

+13-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apt-get install -y python3 python3-pip
1515
RUN apt-get install -y ca-certificates curl gnupg
1616
RUN mkdir -p /etc/apt/keyrings
1717
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
18-
ENV NODE_MAJOR=18
18+
ENV NODE_MAJOR=20
1919
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
2020
RUN apt-get update
2121
RUN apt-get install -y nodejs
@@ -32,11 +32,19 @@ COPY ./vcpkg.json ./vcpkg.json
3232
RUN ./scripts/cpp-install-vcpkg.sh
3333

3434
COPY ./package*.json .
35+
COPY ./packages ./packages
36+
COPY ./utils ./utils
3537
RUN npm ci
38+
RUN npm run install-playright-with-deps
3639

37-
COPY ./src-asm ./src-asm
3840
COPY ./src-cpp ./src-cpp
39-
COPY ./src-ts ./src-ts
40-
COPY ./utils ./utils
41+
COPY ./CMake* .
42+
COPY ./vcpkg* .
43+
COPY ./lerna* .
44+
COPY ./vitest* .
45+
46+
ENTRYPOINT ["/bin/bash", "--login", "-c"]
47+
48+
CMD ["/bin/bash"]
4149

42-
CMD ["npm", "run", "test-node"]
50+
# CMD ["npm", "run", "test-node"]

0 commit comments

Comments
 (0)