CI: do not wait for rewatch before starting compiler build (#6919)

Author: cknitt

.github/workflows/ci.yml

@@ -75,14 +75,19 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: cargo build --manifest-path rewatch/Cargo.toml --target ${{matrix.rust-target}} --release
 
+      - name: Copy exe to platform bin dirs
+        run: |
+          cp rewatch/target/${{matrix.rust-target}}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch
+          node ./scripts/copyExes.js -rewatch
+
       - name: Get artifact dir name
         run: node .github/workflows/get_artifact_dir_name.js
 
       - name: "Upload artifact: rewatch binary"
         uses: actions/upload-artifact@v4
         with:
           name: rewatch-${{env.artifact_dir_name}}
-          path: rewatch/target/${{matrix.rust-target}}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }}
+          path: ${{ env.artifact_dir_name }}
 
   # Build statically linked Linux binaries in an Alpine-based Docker container
   # See https://ocamlpro.com/blog/2021_09_02_generating_static_and_portable_executables_with_ocaml
@@ -108,32 +113,6 @@ jobs:
         with:
           args: sh -c "cd ninja && LDFLAGS=-static python configure.py --bootstrap"
 
-      - name: "Upload artifacts"
-        uses: actions/upload-artifact@v4
-        with:
-          name: static-binaries-linux-${{runner.arch}}
-          path: |
-            _build/install/default/bin
-            ninja/ninja
-
-  # The full build including tests does not work on Linux ARM because setup-ocaml fails.
-  # Therefore, only upload the binaries from the static build
-  upload-linux-arm64-binaries:
-    needs:
-      - build-rewatch
-      - static-binaries-linux-arm
-
-    runs-on: buildjet-2vcpu-ubuntu-2204-arm
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download static linux binaries
-        uses: actions/download-artifact@v4
-        with:
-          name: static-binaries-linux-${{ runner.arch }}
-
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -142,14 +121,8 @@ jobs:
       - name: Get artifact dir name
         run: node .github/workflows/get_artifact_dir_name.js
 
-      - name: Download rewatch binary
-        uses: actions/download-artifact@v4
-        with:
-          name: rewatch-${{ env.artifact_dir_name }}
-          path: rewatch
-
       - name: Copy exes to platform bin dirs
-        run: node ./scripts/copyExes.js
+        run: node ./scripts/copyExes.js -compiler
 
       - name: "Upload artifacts: binaries"
         uses: actions/upload-artifact@v4
@@ -158,9 +131,6 @@ jobs:
           path: ${{ env.artifact_dir_name }}
 
   build:
-    needs:
-      - build-rewatch
-
     strategy:
       fail-fast: false
       matrix:
@@ -197,12 +167,6 @@ jobs:
       - name: Get artifact dir name
         run: node .github/workflows/get_artifact_dir_name.js
 
-      - name: Download rewatch binary
-        uses: actions/download-artifact@v4
-        with:
-          name: rewatch-${{ env.artifact_dir_name }}
-          path: rewatch
-
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         uses: awalsh128/[email protected]
@@ -345,7 +309,7 @@ jobs:
         run: node scripts/buildNinjaBinary.js
 
       - name: Copy exes to platform bin dirs
-        run: node ./scripts/copyExes.js
+        run: node ./scripts/copyExes.js -compiler
 
       - name: "Check if syntax subfolder has changed"
         id: syntax-diff
@@ -424,7 +388,11 @@ jobs:
           path: lib/ocaml
 
   package:
-    needs: build
+    needs:
+      - build
+      - build-rewatch
+      - static-binaries-linux-arm
+  
     runs-on: ubuntu-latest
 
     steps:
@@ -442,7 +410,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: "@(binaries-*|lib-ocaml)"
+          pattern: "@(binaries-*|rewatch-*|lib-ocaml)"
 
       - name: Move artifacts
         run: ./scripts/moveArtifacts.sh

Makefile

@@ -4,7 +4,7 @@ DUNE_BIN_DIR = ./_build/install/default/bin
 
 build: ninja rewatch
 	dune build
-	./scripts/copyExes.js
+	./scripts/copyExes.js -compiler
 
 watch:
 	dune build -w
@@ -18,6 +18,7 @@ dce:
 rewatch:
 	cargo build --manifest-path rewatch/Cargo.toml
 	cp rewatch/target/debug/rewatch rewatch
+	./scripts/copyExes.js -rewatch
 
 ninja/ninja:
 	./scripts/buildNinjaBinary.js

scripts/copyExes.js

@@ -31,8 +31,13 @@ function copyExe(dir, exe) {
   }
 }
 
-copyExe(duneBinDir, "rescript");
-copyExe(duneBinDir, "bsc");
-copyExe(duneBinDir, "bsb_helper");
-copyExe(ninjaDir, "ninja");
-copyExe(rewatchDir, "rewatch");
+if (process.argv.includes("-all") || process.argv.includes("-compiler")) {
+  copyExe(duneBinDir, "rescript");
+  copyExe(duneBinDir, "bsc");
+  copyExe(duneBinDir, "bsb_helper");
+  copyExe(ninjaDir, "ninja");
+}
+
+if (process.argv.includes("-all") || process.argv.includes("-rewatch")) {
+  copyExe(rewatchDir, "rewatch");
+}

scripts/moveArtifacts.sh

@@ -24,13 +24,15 @@ check_statically_linked() {
     fi
 }
 
-chmod +x binaries-*/*.exe
+chmod +x binaries-*/*.exe rewatch-*/*.exe
 
-mv binaries-darwin darwin
-mv binaries-darwinarm64 darwinarm64
-mv binaries-linux linux
-mv binaries-linuxarm64 linuxarm64
-mv binaries-win32 win32
+mkdir darwin darwinarm64 linux linuxarm64 win32
+
+mv binaries-darwin/* rewatch-darwin/* darwin
+mv binaries-darwinarm64/* rewatch-darwinarm64/* darwinarm64
+mv binaries-linux/* rewatch-linux/* linux
+mv binaries-linuxarm64/* rewatch-linuxarm64/* linuxarm64
+mv binaries-win32/* rewatch-win32/* win32
 
 mv lib-ocaml lib/ocaml
 mv ninja/COPYING ninja.COPYING