Clean up integration test running

Author: cknitt

.github/workflows/ci.yml

@@ -20,32 +20,6 @@ env:
   OCAMLRUNPARAM: b
 
 jobs:
-  test-rewatch-integration:
-    needs:
-      - pkg-pr-new
-    runs-on: ubuntu-latest
-    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: Install ReScript package
-        run: |
-          COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
-          yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}"
-        shell: bash
-        working-directory: rewatch/testrepo
-
-      - name: Run rewatch integration tests
-        run: |
-          make test-rewatch-ci
-
   build-compiler:
     strategy:
       fail-fast: false
@@ -470,7 +444,7 @@ jobs:
         run: |
           yarn dlx pkg-pr-new publish "." "./packages/@rescript/*"
 
-  installationTest:
+  test-integration:
     needs:
       - pkg-pr-new
     strategy:
@@ -488,9 +462,10 @@ jobs:
           - os: windows-latest
             node-target: win32-x64
     runs-on: ${{ matrix.os }}
+    env:
+      RUST_BACKTRACE: "1"
     steps:
       - name: Checkout
-        id: checkout
         uses: actions/checkout@v4
 
       - name: Use Node.js
@@ -524,10 +499,19 @@ jobs:
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
+      - name: Install ReScript package in rewatch/testrepo
+        run: |
+          COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
+          yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}"
+        shell: bash
+        working-directory: rewatch/testrepo
+
+      - name: Run rewatch integration tests
+        run: make test-rewatch-ci
+
   publish:
     needs:
-      - build-compiler
-      - installationTest
+      - test-integration
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-24.04-arm
     steps: