Skip to content

Commit fadb8bb

Browse files
committedJun 26, 2021
fix CI
tweak fix CI fix CI no warn-error for js_compiler fix ci
1 parent eb0ebcf commit fadb8bb

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed
 

‎native/.gitkeep

Whitespace-only changes.

‎scripts/buildocaml.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ var cp = require("child_process");
44
var path = require("path");
55
var fs = require("fs");
66

7-
var ocamlSrcDir = path.join(__dirname, "..", "ocaml");
7+
var ocamlSrcDir = path.join(__dirname, "..", "native");
88
var ocamlVersionFilePath = path.join(ocamlSrcDir, "VERSION");
99

1010
/**
1111
* Ensures the ocaml folder exists at the root of the project, either from the submodule,
1212
* or by extracting the vendor/ocaml.tar.gz there
1313
*/
1414
function ensureOCamlExistsSync() {
15-
if (!fs.existsSync(ocamlSrcDir)) {
16-
fs.mkdirSync(ocamlSrcDir);
17-
}
1815
if (!fs.existsSync(ocamlVersionFilePath)) {
1916
cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
2017
cwd: ocamlSrcDir,

‎scripts/ciTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function runTests() {
6767
var binDir = path.join(__dirname, "..", "jscomp", "bin");
6868
if (ounitTest) {
6969
cp.execSync(
70-
`ocamlc.opt -I . -c js_compiler.mli js_compiler.ml`,
70+
`ocamlc.opt -warn-error -a -I . -c js_compiler.mli js_compiler.ml`,
7171
{
7272
cwd: path.join(__dirname, "..", "lib", "4.06.1", "unstable"),
7373
stdio: [0, 1, 2],

‎scripts/ninja.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,8 @@ exports.vendorNinjaPath = vendorNinjaPath;
7676
* Note ocamldep.opt has built-in macro handling OCAML_VERSION
7777
*/
7878
var getOcamldepFile = () => {
79-
return path.join(
80-
__dirname,
81-
"..",
82-
"native",
83-
require("./buildocaml.js").getVersionPrefix(),
84-
"bin",
85-
"ocamldep.opt"
86-
);
79+
return "ocamldep.opt"
80+
8781
};
8882

8983
/**

‎vendor/ocaml.tar.gz

-119 KB
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.