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..ccb2da9d01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,12 +109,15 @@ 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 + packages: >- + bubblewrap musl-tools rsync cmake + ${{ runner.arch == 'X64' && 'g++-multilib gcc-multilib' || '' }} + 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..61850f1216 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -40,10 +40,13 @@ 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 + packages: >- + bubblewrap musl-tools rsync cmake + ${{ runner.arch == 'X64' && 'g++-multilib gcc-multilib' || '' }} + install-recommends: false + upgrade: false # --- rewatch build cache --------------------------------------------- # `make coverage` shells out to `make` which builds rewatch; cache the