Skip to content

Only build co-installable packages on supported compilers #40

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
moyodiallo merged 1 commit into from
Feb 9, 2023
Merged

Only build co-installable packages on supported compilers #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ocaml-dockerfile
Open in desktop
Submodule ocaml-dockerfile updated 10 files
+2 −12 CHANGES.md
+1 −1 README.md
+1 −5 dockerfile-cmd.opam
+1 −5 dockerfile-opam.opam
+0 −4 dockerfile.opam
+2 −11 dune-project
+17 −54 src-opam/distro.ml
+2 −9 src-opam/distro.mli
+1 −1 src-opam/linux.ml
+18 −16 src-opam/opam.ml
2 changes: 1 addition & 1 deletion ocluster
Open in desktop
Submodule ocluster updated 32 files
+0 −2 .gitattributes
+0 −47 .github/workflows/main.yml
+0 −6 CHANGES.md
+2 −2 Dockerfile
+2 −2 Dockerfile.worker
+8 −8 README.md
+12 −12 bin/admin.ml
+2 −2 bin/client.ml
+1 −1 bin/logging.ml
+9 −13 bin/scheduler.ml
+1 −3 bin/winsvc_wrapper..ml
+5 −10 bin/winsvc_wrapper.winsvc.ml
+33 −26 bin/worker.ml
+6 −7 current_ocluster.opam
+2 −1 dune
+14 −17 dune-project
+1 −1 obuilder
+1 −2 ocluster-api.opam
+3 −4 ocluster.opam
+3 −3 ocurrent-plugin/connection.ml
+2 −2 stress/worker.ml
+1 −0 test/dune
+1 −1 test/mock_builder.ml
+7 −7 worker/cluster_worker.ml
+1 −1 worker/cluster_worker.mli
+0 −12 worker/dune
+0 −1 worker/fetcher.docker.ml
+0 −1 worker/fetcher.macos.ml
+0 −1 worker/fetcher.mli
+6 −5 worker/obuilder_build.ml
+1 −1 worker/obuilder_build.mli
+1 −1 worker/process.ml
2 changes: 1 addition & 1 deletion ocurrent
Open in desktop
Submodule ocurrent updated 33 files
+1 −55 CHANGES.md
+0 −23 current_ssh.opam
+0 −83 doc/examples/confirmation.ml
+1 −4 doc/examples/dune
+0 −55 doc/examples/ssh_command.ml
+0 −1 doc/index.md
+1 −2 lib/current.ml
+1 −7 lib_cache/current_cache.ml
+1 −11 lib_term/analysis.ml
+0 −7 lib_term/current_term.ml
+0 −1 lib_term/dyn.ml
+1 −2 lib_term/output.ml
+1 −1 lib_term/output.mli
+0 −5 lib_term/s.ml
+1 −5 lib_web/current_web.mli
+1 −1 lib_web/jobs.ml
+2 −2 lib_web/main.ml
+2 −4 lib_web/site.ml
+0 −1 plugins/git/test/test_submodules.md
+4 −29 plugins/github/api.ml
+0 −3 plugins/github/api.mli
+0 −7 plugins/github/current_github.mli
+20 −63 plugins/gitlab/api.ml
+1 −11 plugins/gitlab/api.mli
+7 −38 plugins/gitlab/current_gitlab.mli
+0 −8 plugins/ssh/current_ssh.ml
+0 −4 plugins/ssh/current_ssh.mli
+0 −6 plugins/ssh/dune
+0 −30 plugins/ssh/run.ml
+2 −4 test/driver.ml
+1 −1 test/expected/v2.3.dot
+0 −6 test/test.ml
+0 −1 test/test_monitor.ml
27 changes: 3 additions & 24 deletions service/service.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,11 @@ module Make (Opam_repo : Opam_repository_intf.S) = struct
| _ -> Fmt.failwith "BUG: bad output: %s" results)

let ocaml = OpamPackage.Name.of_string "ocaml"
let base_effects = OpamPackage.Name.of_string "base-effects"
let base_domains = OpamPackage.Name.of_string "base-domains"

let is_multicore ocaml_version =
let v =
Ocaml_version.of_string_exn
(OpamPackage.Version.to_string ocaml_version)
in
Ocaml_version.Configure_options.is_multicore v

(* If a local package has a literal constraint on OCaml's version and it doesn't match
the platform, we just remove that package from the set to test, so other packages
can still be tested. If it depends on base-effects or base-domains, require a multicore compiler. *)
let compatible_with ~log ~ocaml_version (dep_name, filter) =
can still be tested. *)
let compatible_with ~ocaml_version (dep_name, filter) =
let check_ocaml = function
| OpamTypes.Constraint (op, OpamTypes.FString v) ->
let v = OpamPackage.Version.of_string v in
Expand All @@ -133,16 +124,6 @@ module Make (Opam_repo : Opam_repository_intf.S) = struct
in
if OpamPackage.Name.equal dep_name ocaml then
OpamFormula.eval check_ocaml filter
else if
OpamPackage.Name.equal dep_name base_effects
|| OpamPackage.Name.equal dep_name base_domains
then (
try is_multicore ocaml_version
with ex ->
Log.info log "is_multicore %S failed: %a"
(OpamPackage.Version.to_string ocaml_version)
Fmt.exn ex;
false)
else true

let handle ~log request t =
Expand Down Expand Up @@ -176,9 +157,7 @@ module Make (Opam_repo : Opam_repository_intf.S) = struct
else
let opam = OpamFile.OPAM.read_from_string contents in
let deps = OpamFile.OPAM.depends opam in
OpamFormula.eval
(compatible_with ~log ~ocaml_version)
deps)
OpamFormula.eval (compatible_with ~ocaml_version) deps)
in
(* If some packages are compatible but some aren't, just solve for the compatible ones.
Otherwise, try to solve for everything to get a suitable error. *)
Expand Down