From 60f99b3e9ca78111ee931cbf8fb315e043770312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 14 May 2019 18:05:47 +0200 Subject: [PATCH] Moved script to rewrite OPAM repository outside of the .gitlab-ci.yml in ligo repo --- .gitlab-ci.yml | 2 +- vendors/ligo-opam-repository | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1907bbed..8a47abb27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ before_script: local-repo-job: script: - - root_dir="$(pwd | sed -e 's/\\/\\\\/' | sed -e 's/&/\\\&/' | sed -e 's/~/\\~/')"; ( cd vendors/ligo-opam-repository; git grep -z -l src: | xargs -0 sed -i -e 's~src: "https://gitlab.com/gabriel.alfour/ligo/-/archive/master/ligo.tar.gz"~src: "git+file://'"$root_dir"'"~' -e 's~src: "https://gitlab.com/gabriel.alfour/ligo-utils/-/archive/master/ligo-utils.tar.gz"~src: "git+file://'"$root_dir"'/vendors/ligo-utils"~' -e 's~src: "https://gitlab.com/gabriel.alfour/tezos-modded/-/archive/master/tezos-modded.tar.gz"~src: "git+file://'"$root_dir"'/vendors/tezos-modded"~' ) + - vendors/ligo-opam-repository/rewrite-local-opam-repository.sh - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository/" - opam install -y --build-test ligo diff --git a/vendors/ligo-opam-repository b/vendors/ligo-opam-repository index d1cc80553..a6d8291dd 160000 --- a/vendors/ligo-opam-repository +++ b/vendors/ligo-opam-repository @@ -1 +1 @@ -Subproject commit d1cc80553b371e2c9d7113ed07942ef7e0e63425 +Subproject commit a6d8291dd2fa97d53dab00ba34a5b8adc05c984b