Merge pull request #73 from kit-ty-kate/github-without-git

Switch all uses of the git:// protocol to https:// (Github disabled git://)
ocurrent · Nov 4, 2021 · ed8bc62 · ed8bc62
2 parents eb80eae + 3cd82bf
commit ed8bc62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src-opam/dockerfile_distro.ml b/src-opam/dockerfile_distro.ml
@@ -120,8 +120,8 @@ let os_family_to_string (os:os_family) =
 
 let opam_repository (os:os_family) =
   match os with
-  | `Cygwin | `Linux -> "git://github.com/ocaml/opam-repository.git"
-  | `Windows -> "git://github.com/fdopen/opam-repository-mingw.git#opam2"
+  | `Cygwin | `Linux -> "https://github.com/ocaml/opam-repository.git"
+  | `Windows -> "https://github.com/fdopen/opam-repository-mingw.git#opam2"
 
 let personality os_family arch =
   match os_family with

diff --git a/src-opam/dockerfile_opam.ml b/src-opam/dockerfile_opam.ml
@@ -31,7 +31,7 @@ let personality ?arch distro =
 let run_as_opam fmt = Linux.run_as_user "opam" fmt
 
 let install_opam_from_source ?(add_default_link=true) ?(prefix= "/usr/local") ?(enable_0install_solver=false) ~branch ~hash () =
-  run "git clone git://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && git checkout %s" hash @@
+  run "git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && git checkout %s" hash @@
   Linux.run_sh
     "cd /tmp/opam && make%s cold && mkdir -p %s/bin && cp /tmp/opam/opam %s/bin/opam-%s && chmod a+x %s/bin/opam-%s && rm -rf /tmp/opam"
     (if enable_0install_solver then " CONFIGURE_ARGS=--with-0install-solver" else "") prefix prefix branch prefix branch @@
@@ -42,7 +42,7 @@ let install_opam_from_source ?(add_default_link=true) ?(prefix= "/usr/local") ?(
 (* Can't satisfy the typechecker... *)
 let install_opam_from_source_cygwin ?(add_default_link=true) ?(prefix= "/usr/local") ?(enable_0install_solver=false) ~branch ~hash () =
   let open Dockerfile_windows.Cygwin in
-  run_sh "git clone git://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && git checkout %s" hash @@
+  run_sh "git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && git checkout %s" hash @@
   run_sh
     "cd /tmp/opam && make%s cold && mkdir -p %s/bin && cp /tmp/opam/opam %s/bin/opam-%s && chmod a+x %s/bin/opam-%s && rm -rf /tmp/opam"
     (if enable_0install_solver then " CONFIGURE_ARGS=--with-0install-solver" else "") prefix prefix branch prefix branch
@@ -317,7 +317,7 @@ let all_ocaml_compilers hub_id arch distro =
     List.filter (fun ov -> D.distro_supported_on arch ov distro) |> fun ovs ->
     let add_beta_remote =
       if List.exists OV.Releases.is_dev ovs then
-         run "opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default"
+         run "opam repo add beta git+https://github.com/ocaml/ocaml-beta-repository --set-default"
       else empty in
     add_beta_remote @@@ List.map (create_switch ~arch distro) ovs
   in
@@ -357,7 +357,7 @@ let separate_ocaml_compilers hub_id arch distro =
   |> List.map (fun ov ->
          let add_remote =
            if OV.Releases.is_dev ov then
-             run "opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default"
+             run "opam repo add beta git+https://github.com/ocaml/ocaml-beta-repository --set-default"
            else empty in
          let default_switch_name = OV.(with_patch (with_variant ov None) None |> to_string) in
          let variants =