Skip to content
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

Stabilize opam switch when its base package is not available anymore #61

Merged
merged 1 commit into from
Sep 11, 2020
Merged

Stabilize opam switch when its base package is not available anymore #61

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-version
Open in desktop
Submodule ocaml-version updated 2 files
+9 −5 ocaml_version.ml
+6 −2 ocaml_version.mli
4 changes: 3 additions & 1 deletion src/pipeline.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ let maybe_add_beta switch =
(* Generate a Dockerfile to install OCaml compiler [switch] in [opam_image]. *)
let install_compiler_df ~arch ~switch opam_image =
let switch_name = Ocaml_version.to_string (Ocaml_version.with_just_major_and_minor switch) in
let (package_name, package_version) = Ocaml_version.Opam.V2.package switch in
let open Dockerfile in
let personality = if Ocaml_version.arch_is_32bit arch then shell ["/usr/bin/linux32"; "/bin/sh"; "-c"] else empty in
from opam_image @@
Expand All @@ -35,8 +36,9 @@ let install_compiler_df ~arch ~switch opam_image =
env ["OPAMYES", "1";
"OPAMERRLOGLEN", "0";
] @@
run "opam switch create %s %s" switch_name (Ocaml_version.Opam.V2.name switch) @@
run "opam switch create %s %s.%s" switch_name package_name package_version @@
run "rm -rf .opam/repo/default/.git" @@
run "opam pin add -k version %s %s" package_name package_version @@
run "opam install -y depext" @@
entrypoint_exec ((if Ocaml_version.arch_is_32bit arch then ["/usr/bin/linux32"] else []) @ ["opam"; "exec"; "--"]) @@
cmd "bash" @@
Expand Down