From 24355f0ae9e263200daf9d3e33f329039a5b6da4 Mon Sep 17 00:00:00 2001 From: Pierre Boutillier Date: Tue, 6 Nov 2018 15:35:33 +0100 Subject: [PATCH] The branch 2.0.0 of opam-repository is now the master branch --- scripts/update_opam_repo.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/update_opam_repo.sh b/scripts/update_opam_repo.sh index afab0e9e9..c846bcd7d 100755 --- a/scripts/update_opam_repo.sh +++ b/scripts/update_opam_repo.sh @@ -3,7 +3,7 @@ # Update the repository of opam packages used by tezos. Tezos uses a # private, epurated, opam repository to store all its # dependencies. This is generated by the official opam repository -# (branch 2.0.0) and then filtered using opam admin to include only +# (branch master) and then filtered using opam admin to include only # the cone of tezos dependencies. This repository is then used to # create the based opam image used by the CI to compile tezos and to # generate the docker images. From time to time, when it is necessary @@ -13,7 +13,7 @@ # w.r.t. the master branch. The procedure is as follows : # # 1. Update the varialbe `full_opam_repository_tag` in `version.sh` to -# a commit hash from the 2.0.0 branch of the official +# a commit hash from the master branch of the official # opam-repository. All the required packages will be extracted from # this snapshot fo the repo. # @@ -52,7 +52,7 @@ src_dir="$(dirname "$script_dir")" opams=$(find "$src_dir/vendors" "$src_dir/src" -name \*.opam -print) ## Full snapshot of the opam repository -git clone https://github.com/ocaml/opam-repository -b 2.0.0 "$tmp_dir" +git clone https://github.com/ocaml/opam-repository -b master "$tmp_dir" ## Adding the various tezos packages