Skip to content

Commit

Permalink
Merge pull request #6363 from kit-ty-kate/gha-alpine-3.21-depexts
Browse files Browse the repository at this point in the history
GHA: Fix the alpine depexts test + speedup gentoo
  • Loading branch information
kit-ty-kate authored Jan 15, 2025
2 parents 95b83ab + 95dca38 commit 3a841b9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/scripts/depexts/generate-actions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/depexts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ 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]
* 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]
Expand Down

0 comments on commit 3a841b9

Please sign in to comment.