Merge pull request #231 from ocurrent/opam-master-macos-freebsd

Use opam master on macOS and FreeBSD too
ocurrent · Sep 4, 2023 · f31b0a3 · f31b0a3
2 parents 6c6fcd9 + f85106c
commit f31b0a3
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lib/opam_build.ml b/lib/opam_build.ml
@@ -87,11 +87,7 @@ let setup_repository ~variant ~for_docker ~opam_version =
   let opam_version_str = match opam_version with
     | `V2_0 -> "2.0"
     | `V2_1 -> "2.1"
-    | `Dev ->
-        match Variant.os variant with
-        | `FreeBSD -> "2.1"
-        | `macOS -> "2.1" (* TODO: Remove that when macOS has a proper up-to-date docker image *)
-        | `linux -> "dev"
+    | `Dev -> "dev"
   in
   let opam_repo_args = match Variant.os variant with
     | `macOS -> " -k local" (* TODO: (copy ...) do not copy the content of .git or something like that and make the subsequent opam pin fail *)