Move the analysis dev and prod binary to more convenient places

Author: chenglou

.github/workflows/ci.yml

@@ -50,9 +50,11 @@ jobs:
     # Also avoids artifacts upload permission loss:
     # https://github.com/actions/upload-artifact/tree/ee69f02b3dfdecd58bb31b4d133da38ba6fe3700#permission-loss
     - name: Compress files
-      run: tar -cvf binary.tar -C server/analysis_binaries current-platform.exe
+      run: >
+        mv analysis/run.exe ${{matrix.os}}-run.exe &&
+        tar -cvf binary.tar ${{matrix.os}}-run.exe
 
     - uses: actions/upload-artifact@v2
       with:
-        name: ${{matrix.os}}.exe
+        name: ${{matrix.os}}-run.exe
         path: binary.tar

.vscodeignore

@@ -3,12 +3,10 @@
 **/*.map
 .gitignore
 **/tsconfig.json
-**/tsconfig.base.json
 contributing.md
-.travis.yml
-client/node_modules/**
-!client/node_modules/vscode-jsonrpc/**
-!client/node_modules/vscode-languageclient/**
-!client/node_modules/vscode-languageserver-protocol/**
-!client/node_modules/vscode-languageserver-types/**
-!client/node_modules/semver/**
+.github/**
+client/node_modules/@types
+client/node_modules/.bin
+server/node_modules/.bin
+node_modules/.bin
+analysis/

analysis/Makefile

@@ -6,8 +6,6 @@ OCAMLOPT = ocamlopt.opt
 OCAMLFLAGS = -g -w +26+27+32+33+39 -bin-annot -I +compiler-libs $(INCLUDES)
 OCAMLDEP = ocamldep.opt
 
-OUTPUT = ../server/analysis_binaries/current-platform.exe
-
 %.cmi : %.mli
 	@echo Building $@
 	@$(OCAMLOPT) $(OCAMLFLAGS) -c $<
@@ -21,13 +19,13 @@ depend:
 
 SOURCE_FILES = $(shell $(OCAMLDEP) -sort `find src -name "*.ml"` | sed -E "s/\.ml/.cmx/g")
 
-$(OUTPUT): $(SOURCE_FILES)
+run.exe: $(SOURCE_FILES)
 	@echo Linking...
-	@$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o $(OUTPUT) \
+	@$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o run.exe \
 		-I +compiler-libs unix.cmxa str.cmxa ocamlcommon.cmxa $(INCLUDES) $(SOURCE_FILES)
 	@echo Done!
 
-build-native: $(OUTPUT) depend
+build-native: run.exe depend
 
 dce: build-native
 	../node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor

analysis/lib/README.md

@@ -3,7 +3,7 @@ function exp {
 }
 
 for file in tests/src/*.res; do
-  ../server/analysis_binaries/current-platform.exe test $file &> $(exp $file)
+  ./run.exe test $file &> $(exp $file)
 done
 
 warningYellow='\033[0;33m'

analysis/test.sh

@@ -1,2 +1 @@
-We store the analysis binaries here.
-
+We store the analysis production binaries here.

server/analysis_binaries/README.md

@@ -16,19 +16,16 @@ export let bscExeReScriptPartialPath = path.join(
   "bsc.exe"
 );
 
-let analysisBinariesFolder = path.join(
+export let analysisDevPath = path.join(
   path.dirname(__dirname),
-  "analysis_binaries"
+  "..",
+  "analysis",
+  "run.exe"
 );
-// For local development and CI tests
-export let analysisCurrentPlatformBinaryPath = path.join(
-  analysisBinariesFolder,
-  "current-platform.exe"
-);
-// Platform-specific production binaries manually downloaded from CI
-export let analysisProductionBinaryPath = path.join(
-  analysisBinariesFolder,
-  process.platform + ".exe"
+export let analysisProdPath = path.join(
+  path.dirname(__dirname),
+  "analysis_binaries",
+  process.platform + "-run.exe"
 );
 
 // can't use the native bsb since we might need the watcher -w flag, which is only in the js wrapper

server/src/constants.ts

@@ -109,10 +109,10 @@ export let runAnalysisAfterSanityCheck = (
   getArgs: (filePath: string) => Array<string>
 ) => {
   let binaryPath;
-  if (fs.existsSync(c.analysisCurrentPlatformBinaryPath)) {
-    binaryPath = c.analysisCurrentPlatformBinaryPath;
-  } else if (fs.existsSync(c.analysisProductionBinaryPath)) {
-    binaryPath = c.analysisProductionBinaryPath;
+  if (fs.existsSync(c.analysisDevPath)) {
+    binaryPath = c.analysisDevPath;
+  } else if (fs.existsSync(c.analysisProdPath)) {
+    binaryPath = c.analysisProdPath;
   } else {
     return null;
   }