From d2588a74e3a58c331094ff4221c0306df4cea384 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 11 Jul 2026 16:52:35 +0200 Subject: [PATCH 1/3] Replace APT package cache action Signed-off-by: Christoph Knittel --- .github/dependabot.yml | 4 ---- .github/workflows/ci.yml | 5 +++-- .github/workflows/coverage.yml | 5 +++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 18c576f3be..c2daf05fa7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,3 @@ updates: directory: "/" schedule: interval: "weekly" - ignore: - # Versions >1.4.3 interfere with caching done by our own CI script, - # causing the dune binary not to be found anymore. - - dependency-name: "awalsh128/cache-apt-pkgs-action" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb790c772c..c84e4eff86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,12 +109,13 @@ jobs: - name: Install dependencies (Linux) if: runner.os == 'Linux' - uses: awalsh128/cache-apt-pkgs-action@v1.4.3 + uses: gerlero/apt-install@v1.3.12 with: # https://github.com/ocaml/setup-ocaml/blob/2f57267f071bc8547dfcb9433ff21d44fffef190/packages/setup-ocaml/src/unix.ts#L48 # plus OPAM wants cmake packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync cmake - version: v4 + install-recommends: false + upgrade: false - name: Restore rewatch build cache id: rewatch-build-cache diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index df0476a522..fc0cc641d9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -40,10 +40,11 @@ jobs: run: yarn install - name: Install system dependencies - uses: awalsh128/cache-apt-pkgs-action@v1.4.3 + uses: gerlero/apt-install@v1.3.12 with: packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync cmake - version: v4 + install-recommends: false + upgrade: false # --- rewatch build cache --------------------------------------------- # `make coverage` shells out to `make` which builds rewatch; cache the From 7f94ed7bbd12e79432537aec61090a4c37f44b13 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 11 Jul 2026 16:55:31 +0200 Subject: [PATCH 2/3] Remove obsolete VCS dependencies Signed-off-by: Christoph Knittel --- .github/workflows/ci.yml | 2 +- .github/workflows/coverage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c84e4eff86..513e747bbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,7 +113,7 @@ jobs: with: # https://github.com/ocaml/setup-ocaml/blob/2f57267f071bc8547dfcb9433ff21d44fffef190/packages/setup-ocaml/src/unix.ts#L48 # plus OPAM wants cmake - packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync cmake + packages: bubblewrap g++-multilib gcc-multilib musl-tools rsync cmake install-recommends: false upgrade: false diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index fc0cc641d9..f6b915795e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -42,7 +42,7 @@ jobs: - name: Install system dependencies uses: gerlero/apt-install@v1.3.12 with: - packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync cmake + packages: bubblewrap g++-multilib gcc-multilib musl-tools rsync cmake install-recommends: false upgrade: false From 389b08b40ec685f604771eea4d1234dfd9913401 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 11 Jul 2026 16:56:14 +0200 Subject: [PATCH 3/3] Handle architecture-specific APT packages Signed-off-by: Christoph Knittel --- .github/workflows/ci.yml | 4 +++- .github/workflows/coverage.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 513e747bbc..ccb2da9d01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,7 +113,9 @@ jobs: with: # https://github.com/ocaml/setup-ocaml/blob/2f57267f071bc8547dfcb9433ff21d44fffef190/packages/setup-ocaml/src/unix.ts#L48 # plus OPAM wants cmake - packages: bubblewrap g++-multilib gcc-multilib musl-tools rsync cmake + packages: >- + bubblewrap musl-tools rsync cmake + ${{ runner.arch == 'X64' && 'g++-multilib gcc-multilib' || '' }} install-recommends: false upgrade: false diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f6b915795e..61850f1216 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -42,7 +42,9 @@ jobs: - name: Install system dependencies uses: gerlero/apt-install@v1.3.12 with: - packages: bubblewrap g++-multilib gcc-multilib musl-tools rsync cmake + packages: >- + bubblewrap musl-tools rsync cmake + ${{ runner.arch == 'X64' && 'g++-multilib gcc-multilib' || '' }} install-recommends: false upgrade: false