Merge pull request #565 from cknitt/macos-arm

Author: cknitt

.github/workflows/ci.yml

@@ -11,13 +11,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-18.04, windows-latest]
+        os: [macos-latest, macos-arm, ubuntu-18.04, windows-latest]
         # syntax explanation:
         # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-additional-values-into-combinations
         include:
           - os: macos-latest
             build: eval $(opam env) && cd analysis && make test
             artifact-folder: darwin
+          - os: macos-arm
+            build: eval $(opam env) && cd analysis && make test
+            artifact-folder: darwinarm64
           - os: ubuntu-18.04
             build: eval $(opam env) && cd analysis && make test
             artifact-folder: linux
@@ -48,9 +51,9 @@ jobs:
         ocaml-compiler: 4.12.x
 
     - name: Use Node.js
-      uses: actions/setup-node@v2.1.5
+      uses: actions/setup-node@v3
       with:
-        node-version: 14.4.0
+        node-version: 16
 
     - run: npm ci
     - run: opam install dune
@@ -101,6 +104,14 @@ jobs:
     - run: tar -xvf binary.tar
       working-directory: ./server/analysis_binaries
 
+    - name: Download MacOS ARM binary
+      uses: actions/[email protected]
+      with:
+        name: macos-arm
+        path: ./server/analysis_binaries
+    - run: tar -xvf binary.tar
+      working-directory: ./server/analysis_binaries
+
     - name: Download Linux binary
       uses: actions/[email protected]
       with:

server/src/constants.ts

@@ -23,7 +23,7 @@ export let analysisDevPath = path.join(
 export let analysisProdPath = path.join(
   path.dirname(__dirname),
   "analysis_binaries",
-  process.platform,
+  platformDir,
   "rescript-editor-analysis.exe"
 );