Skip to content

Commit

Permalink
Require CI to install system packages
Browse files Browse the repository at this point in the history
  • Loading branch information
jonahbeckford committed Oct 15, 2024
1 parent 4293cf4 commit 4cb7d39
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- Add `dkml_target_abi` to the test matrix
- Add `dkml-target-abi-<TARGET>` and `dkml-host-abi-<HOST>` when installing `dkml-base-compiler`. Related: Remove `ocaml_options = "ocaml-option-32bit"` for `windows_x86` matrix item that was now unused in dkml-base-compiler.
- Remove unused `opam_abi` from the test matrix.
- Add `--assume-depexts` during install of OCaml compiler. That means system packages are not auto-installed and your CI system will need to explicitly add any requirements like `g++-multilib gcc-multilib` for linux_x86.

## 2.1.3

Expand Down
5 changes: 3 additions & 2 deletions src/scripts/setup-dkml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1279,8 +1279,9 @@ do_install_compiler() {
shift
section_begin "install-compiler-$do_install_compiler_NAME" "Install OCaml compiler for $do_install_compiler_NAME switch"
opamrun pin list --switch "$do_install_compiler_NAME"
# shellcheck disable=SC2086
opamrun upgrade --switch "$do_install_compiler_NAME" --yes dkml-base-compiler conf-dkml-cross-toolchain "dkml-host-abi-${dkml_host_abi}" "dkml-target-abi-${dkml_target_abi}" ${ocaml_options:-}
# --assume-depexts: CI needs system packages? For reproducibility do it explicitly elsewhere. Example: g++-multilib gcc-multilib for linux_x86.
# shellcheck disable=SC2086
opamrun upgrade --switch "$do_install_compiler_NAME" --assume-depexts --yes dkml-base-compiler conf-dkml-cross-toolchain "dkml-host-abi-${dkml_host_abi}" "dkml-target-abi-${dkml_target_abi}" ${ocaml_options:-}
section_end "install-compiler-$do_install_compiler_NAME"
}
do_summary() {
Expand Down

0 comments on commit 4cb7d39

Please sign in to comment.