From 68dc1cc14336b31aaf97547a82facb9d7362e24f Mon Sep 17 00:00:00 2001
From: Christoph Knittel <ck@cca.io>
Date: Mon, 9 Nov 2026 13:54:27 +0000
Subject: [PATCH] Skip the build system's integration suites in the OCaml 5.0
 job

This job only needs to check that the compiler builds with the oldest
OCaml version we support. The build system's integration tests already
run in the linux-x64 job, so this job now skips them. A new matrix flag,
skip_rewatch_integration_tests, turns them off. The unit tests still run.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Kbf3gHAzsdStoCEpBgx2tS
Signed-off-by: Christoph Knittel <ck@cca.io>
---
 .github/workflows/ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 916c515a42..dfa74ced7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,13 +60,14 @@ jobs:
             dune-profile: release
 
           # Verify that the compiler still builds with the oldest OCaml version we support.
-          # The build system's snapshot tests are skipped on this job; the
-          # first linux-x64 job runs them. OCaml 5.0 does not build with GCC 15
-          # (C23 by default), so this job stays on Ubuntu 24.04.
+          # It runs only the build system's unit tests; the other build system
+          # tests repeat the linux-x64 job's. OCaml 5.0 does not build with
+          # GCC 15 (C23 by default), so this job stays on Ubuntu 24.04.
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
             node-target: linux-x64
             dune-profile: static
+            skip_rewatch_integration_tests: true
 
     runs-on: ${{matrix.os}}
 
@@ -224,7 +225,7 @@ jobs:
         shell: bash
 
       - name: Run rewatch snapshot tests
-        if: ${{ !contains(matrix.ocaml_compiler, '5.0.0') }}
+        if: ${{ !matrix.skip_rewatch_integration_tests }}
         timeout-minutes: 20
         run: |
           . rewatch-ocaml/tests/process_watchdog.sh
@@ -248,7 +249,7 @@ jobs:
         shell: bash
 
       - name: Run rewatch verbose output tests
-        if: ${{ !contains(matrix.ocaml_compiler, '5.0.0') }}
+        if: ${{ !matrix.skip_rewatch_integration_tests }}
         timeout-minutes: 10
         run: |
           bash rewatch-ocaml/tests/check_verbose_output.sh \
@@ -270,6 +271,7 @@ jobs:
       # process runs its executable as it starts, so it runs a copy. Its
       # output is shown once both are done.
       - name: Run rewatch focused integration and canonical tests
+        if: ${{ !matrix.skip_rewatch_integration_tests }}
         timeout-minutes: 30
         run: |
           bin=packages/@rescript/${{ matrix.node-target }}/bin