CI (#4)

* start prepping for building release in CI * correct core versions * love me some peer deps * ci * geez * fix test script * ci * ci * ci * try ci * restructure * some more tweaks * try adding step for publishing release version
zth · May 1, 2023 · fb96044 · fb96044
1 parent 5706ca8
commit fb96044
Show file tree

Hide file tree

Showing 76 changed files with 330 additions and 395 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,162 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+    tags: "*.*.*"
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Stay on the oldest Ubuntu version that's still supported by Github Actions
+        # to avoid glibc incompatibilities as far as possible.
+        # TODO: Can we enable macos-arm here?
+        os: [macos-latest, ubuntu-20.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
+            artifact-folder: darwin
+          # - os: macos-arm
+          #  artifact-folder: darwinarm64
+          - os: ubuntu-20.04
+            artifact-folder: linux
+          - os: windows-latest
+            artifact-folder: win32
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      # needed for Windows testing
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - uses: actions/checkout@v3
+
+      - name: Cache OCaml's opam
+        uses: actions/cache@v3
+        with:
+          path: ~/.opam
+          key: ${{matrix.os}}-rescript-vscode-v4
+
+      - name: Use OCaml
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: 4.14.x
+
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - run: npm ci --legacy-peer-deps
+      - run: opam install dune cppo
+      # - run: npm run res:build
+
+      # These 2 runs (or just the second?) are for when you have opam dependencies. We don't.
+      # Don't add deps. But if you ever do, un-comment these and add an .opam file.
+      # - run: opam pin add resgraph.dev . --no-action
+      # - run: opam install . --deps-only --with-doc --with-test
+
+      - name: Build and test
+        run: opam exec -- make test
+
+      # Also avoids artifacts upload permission loss:
+      # https://github.com/actions/upload-artifact/tree/ee69f02b3dfdecd58bb31b4d133da38ba6fe3700#permission-loss
+      - name: Compress files
+        run: |
+          cd bin
+          mkdir ${{matrix.artifact-folder}}
+          mv dev/resgraph.exe ${{matrix.artifact-folder}}
+          tar -cvf binary.tar ${{matrix.artifact-folder}}
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{matrix.os}}
+          path: bin/binary.tar
+
+  package:
+    needs: test
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - run: npm ci --legacy-peer-deps
+      - run: npm run res:build
+
+      - name: Download MacOS binary
+        uses: actions/download-artifact@v3
+        with:
+          name: macos-latest
+          path: ./bin
+      - run: tar -xvf binary.tar
+        working-directory: ./bin
+
+      #- name: Download MacOS ARM binary
+      #  uses: actions/download-artifact@v3
+      #  with:
+      #    name: macos-arm
+      #    path: ./bin
+      #- run: tar -xvf binary.tar
+      #  working-directory: ./bin
+
+      - name: Download Linux binary
+        uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-20.04
+          path: ./bin
+      - run: tar -xvf binary.tar
+        working-directory: ./bin
+
+      - name: Download Windows binary
+        uses: actions/download-artifact@v3
+        with:
+          name: windows-latest
+          path: ./bin
+      - run: tar -xvf binary.tar
+        working-directory: ./bin
+
+      - name: Cleanup tar file
+        run: rm binary.tar
+        working-directory: ./bin
+
+      - name: Store short commit SHA for filename
+        id: vars
+        env:
+          COMMIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+        run: echo "::set-output name=sha_short::${COMMIT_SHA:0:7}"
+
+      - name: Store tag name
+        id: tag_name
+        if: startsWith(github.ref, 'refs/tags/')
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+
+      - name: Package release
+        run: npm pack
+
+      - name: Rename package
+        run: mv resgraph*.tgz resgraph.tgz
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: resgraph.tgz
+          path: resgraph.tgz
+
+      - name: Publish release version if wanted
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./package.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,7 @@
+# ResGraph Changelog
+
+## main
+
+## 0.1.0
+
+Initial release!
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 SHELL = /bin/bash
 
 build-resgraph-binary:
-	rm -f resgraph.exe
+	rm -f bin/dev/resgraph.exe
 	dune build
-	cp _build/install/default/bin/resgraph resgraph.exe
+	cp _build/install/default/bin/resgraph bin/dev/resgraph.exe
 
 build-tests:
 	make -C tests build
@@ -22,7 +22,7 @@ test-resgraph-binary: build-resgraph-binary
 test: test-resgraph-binary
 
 clean:
-	rm -f resgraph.exe
+	rm -f bin/dev/resgraph.exe
 	dune clean
 	make -C tests clean
 	make -C reanalyze clean

diff --git a/bin/dev/.gitkeep b/bin/dev/.gitkeep
diff --git a/bsconfig.json b/bsconfig.json
@@ -1,5 +1,5 @@
 {
-  "name": "rescript-relay-router",
+  "name": "resgraph",
   "version": "0.1.0",
   "uncurried": true,
   "sources": [
@@ -20,8 +20,5 @@
     "rescript-nodejs",
     "@glennsl/rescript-fetch"
   ],
-  "bsc-flags": ["-open NodeJs", "-open RescriptCore"],
-  "js-post-build": {
-    "cmd": "./scripts/post-build.sh"
-  }
+  "bsc-flags": ["-open NodeJs", "-open RescriptCore"]
 }
diff --git a/cli/Cli.res b/cli/Cli.res
@@ -1,3 +1,5 @@
+@@directive("#!/usr/bin/env node")
+
 @val
 external argv: array<option<string>> = "process.argv"
 

diff --git a/cli/Utils.res b/cli/Utils.res
@@ -47,8 +47,21 @@ external toCallResult: string => callResult = "JSON.parse"
 
 external infinity: int = "Infinity"
 
+let devBinLocation = "../bin/dev/resgraph.exe"
+
+let hasDevBin = Lazy.from_fun(() => Fs.existsSync(devBinLocation))
+
 let callPrivateCli = command => {
-  "../resgraph.exe"
+  let hasDevBin = hasDevBin->Lazy.force
+
+  // TODO: macos-arm
+  let binLocation = if hasDevBin {
+    devBinLocation
+  } else {
+    "../bin/" ++ Os.platform() ++ "/resgraph.exe"
+  }
+
+  binLocation
   ->ChildProcess.execFileSyncWith(
     command->privateCliCallToArgs,
     ChildProcess.execFileSyncOptions(~maxBuffer=infinity, ()),

diff --git a/example/bsconfig.json b/example/bsconfig.json
@@ -3,6 +3,10 @@
   "name": "resgraph-example",
   "version": "0.1.0",
   "sources": [
+    {
+      "dir": "../src/res",
+      "subdirs": true
+    },
     {
       "dir": "src",
       "subdirs": true

diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@rescript/core": "^0.2.0",
+    "@rescript/core": "0.3.0",
     "rescript": "^11.0.0-alpha.5",
     "@glennsl/rescript-fetch": "^0.2.0"
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,6 +7,9 @@
     "res:build": "rescript build -with-deps",
     "res:watch": "rescript build -with-deps -w"
   },
+  "bin": {
+    "resgraph": "cli/Cli.mjs"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/zth/resgraph.git"
@@ -19,12 +22,22 @@
   },
   "homepage": "https://github.com/zth/resgraph#readme",
   "dependencies": {
-    "@rescript/core": "^0.2.0",
+    "@rescript/core": "0.3.0",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "rescript": "^11.0.0-alpha.5",
     "@glennsl/rescript-fetch": "0.2.0",
     "rescript-nodejs": "^14.3.1",
     "vscode-jsonrpc": "^5.0.1"
-  }
+  },
+  "files": [
+    "bin/*",
+    "src/res",
+    "cli/**/*.mjs",
+    "bsconfig.json",
+    "package.json",
+    "LICENSE",
+    "README.md",
+    "CHANGELOG.md"
+  ]
 }
diff --git a/scripts/post-build.sh b/scripts/post-build.sh
diff --git a/src/BuildSystem.ml → src/ml/BuildSystem.ml b/src/BuildSystem.ml → src/ml/BuildSystem.ml
diff --git a/src/Cfg.ml → src/ml/Cfg.ml b/src/Cfg.ml → src/ml/Cfg.ml
diff --git a/src/Cli.ml → src/ml/Cli.ml b/src/Cli.ml → src/ml/Cli.ml
diff --git a/src/Cmt.ml → src/ml/Cmt.ml b/src/Cmt.ml → src/ml/Cmt.ml
diff --git a/src/Commands.ml → src/ml/Commands.ml b/src/Commands.ml → src/ml/Commands.ml
diff --git a/src/Completion.ml → src/ml/Completion.ml b/src/Completion.ml → src/ml/Completion.ml
diff --git a/src/CompletionBackEnd.ml → src/ml/CompletionBackEnd.ml b/src/CompletionBackEnd.ml → src/ml/CompletionBackEnd.ml
diff --git a/src/CompletionDecorators.ml → src/ml/CompletionDecorators.ml b/src/CompletionDecorators.ml → src/ml/CompletionDecorators.ml
diff --git a/src/CompletionExpressions.ml → src/ml/CompletionExpressions.ml b/src/CompletionExpressions.ml → src/ml/CompletionExpressions.ml
diff --git a/src/CompletionFrontEnd.ml → src/ml/CompletionFrontEnd.ml b/src/CompletionFrontEnd.ml → src/ml/CompletionFrontEnd.ml
diff --git a/src/CompletionJsx.ml → src/ml/CompletionJsx.ml b/src/CompletionJsx.ml → src/ml/CompletionJsx.ml
diff --git a/src/CompletionPatterns.ml → src/ml/CompletionPatterns.ml b/src/CompletionPatterns.ml → src/ml/CompletionPatterns.ml
diff --git a/src/Completions.ml → src/ml/Completions.ml b/src/Completions.ml → src/ml/Completions.ml
diff --git a/src/Diagnostics.ml → src/ml/Diagnostics.ml b/src/Diagnostics.ml → src/ml/Diagnostics.ml
diff --git a/src/DumpAst.ml → src/ml/DumpAst.ml b/src/DumpAst.ml → src/ml/DumpAst.ml
diff --git a/src/Files.ml → src/ml/Files.ml b/src/Files.ml → src/ml/Files.ml
diff --git a/src/FindFiles.ml → src/ml/FindFiles.ml b/src/FindFiles.ml → src/ml/FindFiles.ml
diff --git a/src/GenerateSchema.ml → src/ml/GenerateSchema.ml b/src/GenerateSchema.ml → src/ml/GenerateSchema.ml
diff --git a/src/GenerateSchemaDiagnostics.ml → src/ml/GenerateSchemaDiagnostics.ml b/src/GenerateSchemaDiagnostics.ml → src/ml/GenerateSchemaDiagnostics.ml
diff --git a/src/GenerateSchemaSDL.ml → src/ml/GenerateSchemaSDL.ml b/src/GenerateSchemaSDL.ml → src/ml/GenerateSchemaSDL.ml
diff --git a/src/GenerateSchemaTypePrinters.ml → src/ml/GenerateSchemaTypePrinters.ml b/src/GenerateSchemaTypePrinters.ml → src/ml/GenerateSchemaTypePrinters.ml
diff --git a/src/GenerateSchemaTypes.ml → src/ml/GenerateSchemaTypes.ml b/src/GenerateSchemaTypes.ml → src/ml/GenerateSchemaTypes.ml
diff --git a/src/GenerateSchemaUtils.ml → src/ml/GenerateSchemaUtils.ml b/src/GenerateSchemaUtils.ml → src/ml/GenerateSchemaUtils.ml
diff --git a/src/GenerateSchemaValidation.ml → src/ml/GenerateSchemaValidation.ml b/src/GenerateSchemaValidation.ml → src/ml/GenerateSchemaValidation.ml
diff --git a/src/Hint.ml → src/ml/Hint.ml b/src/Hint.ml → src/ml/Hint.ml
diff --git a/src/JsxHacks.ml → src/ml/JsxHacks.ml b/src/JsxHacks.ml → src/ml/JsxHacks.ml
diff --git a/src/Loc.ml → src/ml/Loc.ml b/src/Loc.ml → src/ml/Loc.ml
diff --git a/src/LocalTables.ml → src/ml/LocalTables.ml b/src/LocalTables.ml → src/ml/LocalTables.ml
diff --git a/src/Log.ml → src/ml/Log.ml b/src/Log.ml → src/ml/Log.ml
diff --git a/src/Markdown.ml → src/ml/Markdown.ml b/src/Markdown.ml → src/ml/Markdown.ml
diff --git a/src/ModuleResolution.ml → src/ml/ModuleResolution.ml b/src/ModuleResolution.ml → src/ml/ModuleResolution.ml
diff --git a/src/Packages.ml → src/ml/Packages.ml b/src/Packages.ml → src/ml/Packages.ml
diff --git a/src/Pos.ml → src/ml/Pos.ml b/src/Pos.ml → src/ml/Pos.ml
diff --git a/src/PrintType.ml → src/ml/PrintType.ml b/src/PrintType.ml → src/ml/PrintType.ml
diff --git a/src/ProcessAttributes.ml → src/ml/ProcessAttributes.ml b/src/ProcessAttributes.ml → src/ml/ProcessAttributes.ml
diff --git a/src/ProcessCmt.ml → src/ml/ProcessCmt.ml b/src/ProcessCmt.ml → src/ml/ProcessCmt.ml
diff --git a/src/ProcessExtra.ml → src/ml/ProcessExtra.ml b/src/ProcessExtra.ml → src/ml/ProcessExtra.ml
diff --git a/src/Protocol.ml → src/ml/Protocol.ml b/src/Protocol.ml → src/ml/Protocol.ml
diff --git a/src/Range.ml → src/ml/Range.ml b/src/Range.ml → src/ml/Range.ml
diff --git a/src/References.ml → src/ml/References.ml b/src/References.ml → src/ml/References.ml
diff --git a/src/ResolvePath.ml → src/ml/ResolvePath.ml b/src/ResolvePath.ml → src/ml/ResolvePath.ml
diff --git a/src/Scope.ml → src/ml/Scope.ml b/src/Scope.ml → src/ml/Scope.ml
diff --git a/src/Shared.ml → src/ml/Shared.ml b/src/Shared.ml → src/ml/Shared.ml
diff --git a/src/SharedTypes.ml → src/ml/SharedTypes.ml b/src/SharedTypes.ml → src/ml/SharedTypes.ml
diff --git a/src/TypeUtils.ml → src/ml/TypeUtils.ml b/src/TypeUtils.ml → src/ml/TypeUtils.ml
diff --git a/src/Uri.ml → src/ml/Uri.ml b/src/Uri.ml → src/ml/Uri.ml
diff --git a/src/Uri.mli → src/ml/Uri.mli b/src/Uri.mli → src/ml/Uri.mli
diff --git a/src/Utils.ml → src/ml/Utils.ml b/src/Utils.ml → src/ml/Utils.ml
diff --git a/src/dune → src/ml/dune b/src/dune → src/ml/dune