Fix CI, move rewatch build steps into main compiler build job

Author: cknitt

.github/workflows/ci.yml

@@ -46,81 +46,6 @@ jobs:
         run: |
           make test-rewatch-ci
 
-  build-rewatch:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-13 # x64
-            rust-target: x86_64-apple-darwin
-            node-target: darwin-x64
-          - os: macos-14 # ARM
-            rust-target: aarch64-apple-darwin
-            node-target: darwin-arm64
-          - os: ubuntu-24.04 # x64
-            rust-target: x86_64-unknown-linux-musl
-            node-target: linux-x64
-          - os: ubuntu-24.04-arm # ARM
-            rust-target: aarch64-unknown-linux-musl
-            node-target: linux-arm64
-          - os: windows-latest
-            rust-target: x86_64-pc-windows-gnu
-            node-target: win32-x64
-
-    runs-on: ${{matrix.os}}
-
-    env:
-      RUST_BACKTRACE: "1"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Restore build cache
-        id: build-cache
-        uses: actions/cache@v4
-        with:
-          path: rewatch/target
-          key: rewatch-build-v2-${{ matrix.rust-target }}-${{ hashFiles('rewatch/src/**', 'rewatch/Cargo.lock') }}
-
-      - name: Install musl gcc
-        if: steps.build-cache.outputs.cache-hit != 'true' && runner.os == 'Linux'
-        run: sudo apt-get install -y --no-install-recommends musl-tools
-
-      - name: Install rust toolchain
-        if: steps.build-cache.outputs.cache-hit != 'true'
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-          targets: ${{ matrix.rust-target }}
-
-      - name: Build rewatch
-        if: steps.build-cache.outputs.cache-hit != 'true'
-        run: |
-          cargo build --manifest-path rewatch/Cargo.toml --target ${{ matrix.rust-target }} --release
-
-      - name: Run rewatch unit tests
-        if: steps.build-cache.outputs.cache-hit != 'true'
-        run: |
-          cargo test --manifest-path rewatch/Cargo.toml
-
-      - name: Copy rewatch binary
-        run: |
-          cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch.exe
-        shell: bash
-
-      - name: "Upload artifact: rewatch binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: rewatch-${{ matrix.node-target }}
-          path: rewatch.exe
-          if-no-files-found: error
-
   build-compiler:
     strategy:
       fail-fast: false
@@ -131,33 +56,44 @@ jobs:
             upload_binaries: true
             upload_libs: true
             node-target: linux-x64
+            rust-target: x86_64-unknown-linux-musl
           - os: ubuntu-24.04-arm # ARM
             ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
             upload_binaries: true
             # Build the playground compiler and run the benchmarks on the fastest runner
             build_playground: true
             benchmarks: true
             node-target: linux-arm64
+            rust-target: aarch64-unknown-linux-musl
           - os: macos-13 # x64
             ocaml_compiler: 5.3.0
             upload_binaries: true
             node-target: darwin-x64
+            rust-target: x86_64-apple-darwin
           - os: macos-14 # ARM
             ocaml_compiler: 5.3.0
             upload_binaries: true
             node-target: darwin-arm64
+            rust-target: aarch64-apple-darwin
           - os: windows-latest
             ocaml_compiler: 5.3.0
             upload_binaries: true
             node-target: win32-x64
+            rust-target: x86_64-pc-windows-gnu
 
           # Verify that the compiler still builds with older OCaml versions
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+            node-target: linux-x64
+            rust-target: x86_64-unknown-linux-musl
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
+            node-target: linux-x64
+            rust-target: x86_64-unknown-linux-musl
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
+            node-target: linux-x64
+            rust-target: x86_64-unknown-linux-musl
 
     runs-on: ${{matrix.os}}
 
@@ -166,6 +102,7 @@ jobs:
       # we do track its version manually
       OPAM_VERSION: 2.3.0
       DUNE_PROFILE: release
+      RUST_BACKTRACE: "1"
 
     steps:
       - name: "Windows: Set git config"
@@ -184,6 +121,9 @@ jobs:
           cache: yarn
           node-version-file: .nvmrc
 
+      - name: Install npm packages
+        run: yarn install
+
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         uses: awalsh128/[email protected]
@@ -192,6 +132,36 @@ jobs:
           packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
           version: v3
 
+      - name: Restore rewatch build cache
+        id: rewatch-build-cache
+        uses: actions/cache@v4
+        with:
+          path: rewatch/target
+          key: rewatch-build-v2-${{ matrix.rust-target }}-${{ hashFiles('rewatch/src/**', 'rewatch/Cargo.lock') }}
+
+      - name: Install rust toolchain
+        if: steps.rewatch-build-cache.outputs.cache-hit != 'true'
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          targets: ${{ matrix.rust-target }}
+
+      - name: Build rewatch
+        if: steps.rewatch-build-cache.outputs.cache-hit != 'true'
+        run: |
+          cargo build --manifest-path rewatch/Cargo.toml --target ${{ matrix.rust-target }} --release
+
+      - name: Run rewatch unit tests
+        if: steps.rewatch-build-cache.outputs.cache-hit != 'true'
+        run: |
+          cargo test --manifest-path rewatch/Cargo.toml
+
+      - name: Copy rewatch binary
+        run: |
+          cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch
+          ./scripts/copyExes.js --rewatch
+        shell: bash
+
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
@@ -336,9 +306,6 @@ jobs:
             _build
           key: ${{ steps.compiler-build-state-key.outputs.value }}
 
-      - name: Install npm packages
-        run: yarn install
-
       - name: Copy compiler exes to platform bin dir
         run: node scripts/copyExes.js --compiler
 
@@ -472,7 +439,6 @@ jobs:
 
   pkg-pr-new:
     needs:
-      - build-rewatch
       - build-compiler
     runs-on: ubuntu-24.04-arm
     steps:
@@ -488,7 +454,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: "@(binaries-*|rewatch-*|lib-ocaml)"
+          pattern: "@(binaries-*|lib-ocaml)"
 
       - name: Move artifacts into packages
         run: .github/workflows/moveArtifacts.sh
@@ -554,7 +520,6 @@ jobs:
 
   publish:
     needs:
-      - build-rewatch
       - build-compiler
       - installationTest
     if: startsWith(github.ref, 'refs/tags/v')
@@ -573,7 +538,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: "@(binaries-*|rewatch-*|lib-ocaml)"
+          pattern: "@(binaries-*|lib-ocaml)"
 
       - name: Move artifacts into packages
         run: .github/workflows/moveArtifacts.sh

.github/workflows/moveArtifacts.sh

@@ -29,12 +29,12 @@ check_statically_linked() {
 mv lib-ocaml lib/ocaml
 
 # @rescript/{target}
-chmod +x binaries-*/*.exe rewatch-*/*.exe
-mv -f binaries-darwin-x64/* rewatch-darwin-x64/* "packages/@rescript/darwin-x64/bin"
-mv -f binaries-darwin-arm64/* rewatch-darwin-arm64/* "packages/@rescript/darwin-arm64/bin"
-mv -f binaries-linux-x64/* rewatch-linux-x64/* "packages/@rescript/linux-x64/bin"
-mv -f binaries-linux-arm64/* rewatch-linux-arm64/* "packages/@rescript/linux-arm64/bin"
-mv -f binaries-win32-x64/* rewatch-win32-x64/* "packages/@rescript/win32-x64/bin"
+chmod +x binaries-*/*.exe
+mv -f binaries-darwin-x64/* "packages/@rescript/darwin-x64/bin"
+mv -f binaries-darwin-arm64/* "packages/@rescript/darwin-arm64/bin"
+mv -f binaries-linux-x64/* "packages/@rescript/linux-x64/bin"
+mv -f binaries-linux-arm64/* "packages/@rescript/linux-arm64/bin"
+mv -f binaries-win32-x64/* "packages/@rescript/win32-x64/bin"
 check_statically_linked "packages/@rescript/linux-x64/bin"
 check_statically_linked "packages/@rescript/linux-arm64/bin"
 

scripts/buildRuntimeRewatch.sh

@@ -3,6 +3,11 @@ set -e
 shopt -s extglob
 
 (cd runtime && ../cli/rewatch.js clean)
+
+rm -f lib/es6/*.js lib/js/*.js lib/ocaml/*
+mkdir -p lib/es6 lib/js lib/ocaml
+mkdir -p runtime/lib/es6 runtime/lib/js
+
 (cd runtime && ../cli/rewatch.js build)
 
 cp runtime/lib/es6/!(Pervasives_mini).js lib/es6