Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

treat "ocaml-compiler" as a package to be ignored by the check whether it uses dune for building #407

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ let skip_packages =
|> List.map ~f:OpamPackage.Name.of_string
|> OpamPackage.Name.Set.of_list

let compiler_package_name = OpamPackage.Name.of_string "ocaml"
let compiler_package_name =
OpamPackage.Name.of_string "ocaml"

let compiler_package_names =
[ compiler_package_name ; OpamPackage.Name.of_string "ocaml-compiler" ]
|> OpamPackage.Name.Set.of_list

let duniverse_opam_repo =
"git+https://github.com/dune-universe/opam-overlays.git"
Expand Down
2 changes: 1 addition & 1 deletion lib/opam.ml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ module Package_summary = struct
| _ -> false

let is_compiler_package { package; _ } =
OpamPackage.Name.equal package.name Config.compiler_package_name
OpamPackage.Name.Set.mem package.name Config.compiler_package_names

let is_skippable_package { package; _ } =
OpamPackage.Name.Set.mem package.name Config.skip_packages
Expand Down
2 changes: 1 addition & 1 deletion opam-monorepo.opam
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ depends: [
"logs"
"opam-file-format" {>= "2.1.0"}
"opam-format" {>= "2.1.0~rc2"}
"opam-state" {>= "2.1.0~rc2"}
"opam-state" {>= "2.1.0~rc2" & < "2.2.0"}
"opam-0install"
"ocaml-version"
"sexplib"
Expand Down