From 54e031398c62bc9c8332b513c2808b78976191c9 Mon Sep 17 00:00:00 2001 From: Kate Date: Sun, 12 Jan 2025 21:12:29 +0000 Subject: [PATCH 1/2] GHA: Fix the alpine depexts test --- .github/workflows/depexts.yml | 2 +- master_changes.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/depexts.yml b/.github/workflows/depexts.yml index 88355bd2f5b..47bc1626d04 100644 --- a/.github/workflows/depexts.yml +++ b/.github/workflows/depexts.yml @@ -18,7 +18,7 @@ defaults: env: OPAMVERSION: 2.1.6 OPAM_REPO: https://github.com/ocaml/opam-repository.git - OPAM_REPO_SHA: 6eee105e52e098e36949a584c053a18bcb9b2f6b + OPAM_REPO_SHA: 3ae5ce9d22b199bff9496156de16e838c645a732 jobs: opam-cache: diff --git a/master_changes.md b/master_changes.md index 13f51db2721..a02732575c2 100644 --- a/master_changes.md +++ b/master_changes.md @@ -162,6 +162,7 @@ users) * Update the github action scripts now that homebrew renamed the GNU patch binary to gpatch [#6296 @kit-ty-kate] * Add branch scheme `username/branch` for opam-rt specific branch to use [#6274 @rjbou] * Check `shell/install.sh` using `shellcheck` [#6313 @kit-ty-kate] + * Fix the alpine depexts test [#6363 @kit-ty-kate] ## Doc * Update the command to install opam to point to the new simplified url on opam.ocaml.org [#6226 @kit-ty-kate] From 95dca3845ebfb29c81448de94896fc1d859e6d99 Mon Sep 17 00:00:00 2001 From: Kate Date: Sun, 12 Jan 2025 21:55:58 +0000 Subject: [PATCH 2/2] Speedup the gentoo depexts test by enabling the use of binary packages --- .github/scripts/depexts/generate-actions.sh | 2 ++ master_changes.md | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/scripts/depexts/generate-actions.sh b/.github/scripts/depexts/generate-actions.sh index 07bfb37d6a0..7fc6787f876 100644 --- a/.github/scripts/depexts/generate-actions.sh +++ b/.github/scripts/depexts/generate-actions.sh @@ -76,6 +76,8 @@ FROM gentoo/portage as portage FROM gentoo/stage3 # copy the entire portage volume in COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo +RUN getuto +RUN echo 'FEATURES="getbinpkg"' >> /etc/portage/make.conf RUN emerge -qv $mainlibs EOF ;; diff --git a/master_changes.md b/master_changes.md index a02732575c2..fe42c861507 100644 --- a/master_changes.md +++ b/master_changes.md @@ -163,6 +163,7 @@ users) * Add branch scheme `username/branch` for opam-rt specific branch to use [#6274 @rjbou] * Check `shell/install.sh` using `shellcheck` [#6313 @kit-ty-kate] * Fix the alpine depexts test [#6363 @kit-ty-kate] + * Speedup the gentoo depexts test [#6363 @kit-ty-kate] ## Doc * Update the command to install opam to point to the new simplified url on opam.ocaml.org [#6226 @kit-ty-kate]