Skip to content

Commit

Permalink
Merge pull request #996 from mtelvers/revert-993
Browse files Browse the repository at this point in the history 
Revert PR #993 now Dune 3.17.1 has been released
  • Loading branch information
@mtelvers
mtelvers authored Jan 7, 2025
2 parents aa429f1 + dd9d8cb commit 751fd7c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 112 deletions.
26 changes: 0 additions & 26 deletions lib/opam_build.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,6 @@ let pin_opam_files ~network ?work_dir groups =
|> run ~network "%s";
]

let create_dune_project_files ~network ?dune_work_dir groups =
if groups = [] then []
else
let open Obuilder_spec in
[
groups
|> List.map (fun (dir, _, _) ->
let dir =
Option.map
(fun work_dir -> Fpath.( // ) work_dir dir)
dune_work_dir
|> Option.value ~default:dir
in
Printf.sprintf "echo '(lang dune 3.0)' > %s"
(Filename.quote
(Fpath.to_string (Fpath.( // ) dir (Fpath.v "dune-project")))))
|> String.concat " && \n"
|> run ~network "%s";
]

(* Get the packages directly in "." *)
let rec get_root_opam_packages = function
| [] -> []
Expand Down Expand Up @@ -170,11 +150,6 @@ let install_project_deps ~opam_version ~opam_files ~selection =
| `linux -> None
| `freeBSD -> None
in
let dune_work_dir =
match Variant.os selection.Selection.variant with
| `macOS | `linux | `freeBSD | `openBSD -> work_dir
| `windows -> Some (Fpath.v "/cygdrive/c/Users/opam/src")
in
(* XXX: don't overwrite default config? *)
let opamrc = "" in
let opam_version_str = Opam_version.to_string opam_version in
Expand Down Expand Up @@ -226,7 +201,6 @@ let install_project_deps ~opam_version ~opam_files ~selection =
commit commit;
]
@ pin_opam_files ~network ?work_dir groups
@ create_dune_project_files ~network ?dune_work_dir groups
@ [
env "DEPS" non_root_pkgs;
env "CI" "true";
Expand Down
86 changes: 0 additions & 86 deletions test/service/test_spec.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ let expected_macos_spec =
(copy (src bondi.opam) (dst ./src/./))
(run (network host)
(shell "opam pin add -yn bondi.dev './src/./'"))
(run (network host)
(shell "echo '(lang dune 3.0)' > './src/./dune-project'"))
(env DEPS "base-bigarray.base base-threads.base base-unix.base dune.3.6.0 menhir.20220210 menhirLib.20220210 menhirSdk.20220210 ocaml.4.14.0 ocaml-base-compiler.4.14.0 ocaml-config.2 ocaml-options-vanilla.1")
(env CI true)
(env OCAMLCI true)
Expand Down Expand Up @@ -52,8 +50,6 @@ let expected_linux_spec =
(copy (src bondi.opam) (dst ./))
(run (network host)
(shell "opam pin add -yn bondi.dev './'"))
(run (network host)
(shell "echo '(lang dune 3.0)' > './dune-project'"))
(env DEPS "base-bigarray.base base-threads.base base-unix.base dune.3.6.0 menhir.20220210 menhirLib.20220210 menhirSdk.20220210 ocaml.4.14.0 ocaml-base-compiler.4.14.0 ocaml-config.2 ocaml-options-vanilla.1")
(env CI true)
(env OCAMLCI true)
Expand All @@ -68,40 +64,6 @@ let expected_linux_spec =
)
|}

(* Expected obuilder spec for windows server 2022 build of bondi. *)
let expected_windows_spec =
{|
((from windows-server-2022-amd64-ocaml-4.14)
(comment windows-server-2022-4.14.0_opam-2.3)
(user (uid 1000) (gid 1000)) (env CLICOLOR_FORCE 1)
(env OPAMCOLOR always)
(workdir /src)
(run (shell "sudo ln -f /usr/bin/opam-2.3 /usr/bin/opam"))
(run (shell "opam init --reinit -ni"))
(run (shell "uname -rs && opam exec -- ocaml -version && opam --version"))
(workdir /src)
(run (shell "sudo chown opam /src"))
(run (cache (opam-archives (target /home/opam/.opam/download-cache)))
(network host) (shell "cd ~/opam-repository && (git cat-file -e f207d3f018d642d1fcddb2c118e7fa8e65f4e366 || git fetch origin master) && git reset -q --hard f207d3f018d642d1fcddb2c118e7fa8e65f4e366 && git log --no-decorate -n1 --oneline && opam update -u"))
(copy (src bondi.opam) (dst ./))
(run (network host) (shell "opam pin add -yn bondi.dev './'"))
(run (network host)
(shell "echo '(lang dune 3.0)' > './dune-project'"))
(env DEPS "arch-x86_64.1 base-bigarray.base base-threads.base base-unix.base conf-mingw-w64-gcc-x86_64.1 dune.3.17.0 flexdll.0.43 host-arch-x86_64.1 host-system-mingw.1 menhir.20240715 menhirCST.20240715 menhirLib.20240715 menhirSdk.20240715 mingw-w64-shims.0.2.0 ocaml.4.14.2 ocaml-base-compiler.4.14.2 ocaml-config.3 ocaml-env-mingw64.1 ocaml-options-vanilla.1 system-mingw.1")
(env CI true)
(env OCAMLCI true)
(run (cache (opam-archives (target /home/opam/.opam/download-cache)))
(network host)
(shell "opam update --depexts && opam install --cli=2.3 --depext-only -y bondi.dev $DEPS"))
(run (cache
(opam-archives (target /home/opam/.opam/download-cache)))
(network host)
(shell "opam install $DEPS"))
(copy (src .) (dst /src))
(run (shell "opam exec -- dune build @install @check @runtest && rm -rf _build"))
)
|}

(* Create testable Sexp for Alcotest. *)
let sexp = Alcotest.testable Sexplib0__Sexp.pp_hum Sexplib0__Sexp.equal

Expand Down Expand Up @@ -183,56 +145,8 @@ let test_linux_spec () =
in
Alcotest.(check sexp) "validate" expected actual

let test_windows_spec () =
let open Ocaml_ci in
let expected = Sexplib__Pre_sexp.of_string expected_windows_spec in
let variant =
Variant.v ~arch:`X86_64 ~distro:"windows-server-2022"
~ocaml_version:Ocaml_version.Releases.v4_14_0 ~opam_version:`V2_3
|> Result.get_ok
in
let actual =
Opam_build.spec ~base:"windows-server-2022-amd64-ocaml-4.14"
~opam_version:`V2_3 ~opam_files:[ "bondi.opam" ]
~selection:
Selection.
{
variant;
packages =
[
"bondi.dev";
"arch-x86_64.1";
"base-bigarray.base";
"base-threads.base";
"base-unix.base";
"conf-mingw-w64-gcc-x86_64.1";
"dune.3.17.0";
"flexdll.0.43";
"host-arch-x86_64.1";
"host-system-mingw.1";
"menhir.20240715";
"menhirCST.20240715";
"menhirLib.20240715";
"menhirSdk.20240715";
"mingw-w64-shims.0.2.0";
"ocaml.4.14.2";
"ocaml-base-compiler.4.14.2";
"ocaml-config.3";
"ocaml-env-mingw64.1";
"ocaml-options-vanilla.1";
"system-mingw.1";
];
only_packages = [];
commit = "f207d3f018d642d1fcddb2c118e7fa8e65f4e366";
lower_bound = false;
}
|> Obuilder_spec.sexp_of_t
in
Alcotest.(check sexp) "validate" expected actual

let tests =
[
Alcotest.test_case "macos" `Quick test_macos_spec;
Alcotest.test_case "linux" `Quick test_linux_spec;
Alcotest.test_case "windows" `Quick test_windows_spec;
]

0 comments on commit 751fd7c

Please sign in to comment.