Skip to content

Commit f9f72a5

Browse files
committed
Test amalgamated build on Windows
1 parent 81806be commit f9f72a5

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

.github/workflows/ci.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ jobs:
208208
run: |
209209
cl.exe /DJS_NAN_BOXING=0 /Zs cxxtest.cc
210210
cl.exe /DJS_NAN_BOXING=1 /Zs cxxtest.cc
211+
- name: test amalgamation
212+
run: |
213+
build\${{matrix.buildType}}\qjs.exe amalgam.js
214+
cl.exe /std:c11 /experimental:c11atomics quickjs-amalgam.c api-test.c /Fe:amalgam-api-test.exe
215+
.\amalgam-api-test.exe
211216
212217
windows-msvc-vs2019:
213218
runs-on: windows-2019
@@ -383,6 +388,12 @@ jobs:
383388
- name: test api
384389
run: |
385390
./build/api-test
391+
- name: test amalgamation
392+
run: |
393+
./build/qjs amalgam.js
394+
cc -Wall -I. quickjs-amalgam.c api-test.c -o amalgam-api-test -lm
395+
./amalgam-api-test
396+
386397
windows-mingw-shared:
387398
runs-on: windows-latest
388399
defaults:
@@ -570,7 +581,7 @@ jobs:
570581
amalgam:
571582
strategy:
572583
matrix:
573-
# TODO(bnoordhuis) test on windows
584+
# Windows is tested as part of windows-msvc
574585
config:
575586
- { os: ubuntu-latest }
576587
- { os: macos-latest }

0 commit comments

Comments
 (0)