tweak ci scripts

Author: bobzhang

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs: # a collection of steps
   build: # runs not using Workflows must have a `build` job as entry point
     working_directory: ~/git/bucklescript # directory where steps will run
     docker: # run the steps with Docker
-      - image: circleci/node:8.9.4 # ...with this image as the primary container; this is where all `steps` will run
+      - image: circleci/node:dubnium # ...with this image as the primary container; this is where all `steps` will run
     steps: # a collection of executable commands
       - checkout # special step to check out source code to working directory
       - run:       
@@ -21,8 +21,8 @@ jobs: # a collection of steps
             git submodule init
             git submodule update
       - run:
-          name: install-npm-wee
-          command: npm install # `npm ci` is not available on node v8
+          name: ci-install
+          command: npm ci # `npm ci` is not available on node v8
 
       - run: # run tests
           name: test

.gitignore

@@ -142,4 +142,5 @@ jscomp/.lsp
 .vscode/launch.json
 tracing*.json
 darwin/bsc
-.nyc_output
+.nyc_output
+themes

.npmignore

@@ -35,4 +35,5 @@ vendor/cppo
 vendor/rollup.js
 package/
 *.tgz
-.nyc_output/
+.nyc_output/
+themes

scripts/ciTest.js

@@ -72,8 +72,9 @@ function main() {
   // console.log('OCaml:', output)
   var binDir = path.join(__dirname, "..", "jscomp", "bin");
   if (ounitTest) {
-    var fn = fs.copyFileSync ? fs.copyFileSync : fs.renameSync;
-    fn(
+    
+    // running tests for native code
+    fs.copyFileSync(
       path.join(
         __dirname,
         "..",
@@ -94,13 +95,16 @@ function main() {
     cp.execSync(`./test.exe`, { cwd: binDir, stdio: [0, 1, 2] });
   }
 
+  // running generated js tests  
   if (mochaTest) {
     cp.execSync(`mocha jscomp/test/**/*test.js`, {
       cwd: path.join(__dirname, ".."),
       stdio: [0, 1, 2]
     });
   }
 
+  // set up global directory properly using 
+  // npm config set prefix '~/.npm-global'
   if (installGlobal) {
     console.log("install bucklescript globally");
     cp.execSync("sudo npm i -g --unsafe-perm . && bsc -bs-internal-check", {
@@ -127,6 +131,13 @@ function main() {
       .map(x => x.trim())
       .filter(x => x);
     var themesDir = path.join(__dirname, "..", "themes");
+
+    if(fs.existsSync(themesDir)){
+      // fs.rmdirSync(themesDir,{recursive : true})
+      cp.execSync(`rm -rf ${themesDir}`,{stdio:[0,1,2]})
+      // we dont remove post-installation
+      // since it is useful for debugging
+    }
     fs.mkdirSync(themesDir);
     themes.forEach(function(theme) {
       cp.exec(
@@ -167,6 +178,9 @@ function main() {
     var files = fs.readdirSync(buildTestDir);
     files.forEach(function(file) {
       var testDir = path.join(buildTestDir, file);
+      if(file === 'node_modules' || !fs.lstatSync(testDir).isDirectory()){
+        return 
+      }
       if (!fs.existsSync(path.join(testDir, "input.js"))) {
         console.warn(`input.js does not exist in ${testDir}`);
       } else {

scripts/install.js

@@ -24,8 +24,6 @@ if (supported_os.indexOf(process.platform) < 0) {
 }
 var is_windows = process.platform === "win32";
 
-
-
 var ninja_bin_output = path.join(root_dir, process.platform, "ninja.exe");
 
 /**
@@ -99,8 +97,6 @@ function ensureExists(dir) {
   }
 }
 
-
-
 /**
  * @returns {string|undefined}
  */
@@ -176,7 +172,7 @@ function provideCompiler() {
   if (myVersion !== undefined) {
     return myVersion;
   } else {
-    myVersion = require("./buildocaml.js").getVersionPrefix();
+    myVersion = "4.06.1";
     var ocamlopt =
       process.env.ESY === "true"
         ? "ocamlopt.opt"
@@ -203,11 +199,11 @@ function provideCompiler() {
 
     var filePath = path.join(lib_dir, "release.ninja");
     fs.writeFileSync(filePath, releaseNinja, "ascii");
-    cp.execFileSync(ninja_bin_output, ["-f", "release.ninja","-t", "clean"], {
+    cp.execFileSync(ninja_bin_output, ["-f", "release.ninja", "-t", "clean"], {
       cwd: lib_dir,
       stdio: [0, 1, 2]
     });
-    cp.execFileSync(ninja_bin_output, ["-f", "release.ninja","-v"], {
+    cp.execFileSync(ninja_bin_output, ["-f", "release.ninja", "-v"], {
       cwd: lib_dir,
       stdio: [0, 1, 2]
     });
@@ -218,11 +214,11 @@ function provideCompiler() {
 
 provideNinja();
 
-var ocamlVersion = provideCompiler();
+provideCompiler();
 
-var stdlib = ocamlVersion.includes("4.02") ? "stdlib-402" : "stdlib-406";
+var stdlib = "stdlib-406";
 
 if (process.env.BS_TRAVIS_CI) {
   buildLibs(stdlib);
-  require('./installUtils.js').install()
+  require("./installUtils.js").install();
 }