Skip to content

Commit 005d4c3

Browse files
Fix CI (#244)
* Update setup-ocaml from v2 to v3 * Patch [upstream commit](WebAssembly/spec@485bbd9) disabling JS tests. * Fix race condition in Python test runner Tested successfully with CI [here](https://github.com/WebAssembly/threads/actions/runs/21845585840).
1 parent 0cd7b05 commit 005d4c3

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.github/workflows/ci-interpreter.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ jobs:
1919
- name: Checkout repo
2020
uses: actions/checkout@v2
2121
- name: Setup OCaml
22-
uses: ocaml/setup-ocaml@v2
22+
uses: ocaml/setup-ocaml@v3
2323
with:
2424
ocaml-compiler: 4.12.x
2525
- name: Setup OCaml tools
26-
run: opam install --yes ocamlbuild.0.14.0 ocamlfind.1.9.5 js_of_ocaml.4.0.0 js_of_ocaml-ppx.4.0.0
27-
- name: Setup Node.js
28-
uses: actions/setup-node@v2
29-
with:
30-
node-version: 19.x
26+
run: opam install --yes ocamlfind.1.9.5 js_of_ocaml.4.0.0 js_of_ocaml-ppx.4.0.0
3127
- name: Build interpreter
3228
run: cd interpreter && opam exec make
29+
# Neither V8 nor SpiderMonkey can currently handle all 3.0 tests, so we disable checking JS translation for now.
30+
#- name: Setup Node.js
31+
# uses: actions/setup-node@v4
32+
# with:
33+
# node-version: 25-nightly
34+
#- name: Setup SpiderMonkey
35+
# run: curl -O https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/jsshell-linux-x86_64.zip && unzip jsshell-linux-x86_64.zip
3336
- name: Run tests
34-
run: cd interpreter && opam exec make JS=node ci
37+
run: cd interpreter && opam exec make ci # don't test JS translation
38+
# run: cd interpreter && opam exec make JS=node ci # test with V8
39+
# run: cd interpreter && opam exec make JS=../js ci # test with SM

test/core/run.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ def _runTestFile(self, inputPath):
113113

114114

115115
if __name__ == "__main__":
116-
if not os.path.exists(outputDir):
117-
os.makedirs(outputDir)
116+
os.makedirs(outputDir, exist_ok=True)
118117
for fileName in inputFiles:
119118
testName = 'test ' + os.path.basename(fileName)
120119
setattr(RunTests, testName, lambda self, file=fileName: self._runTestFile(file))

0 commit comments

Comments
 (0)