diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 419be510b..e2bbafa2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ local-dune-job: <<: *before_script script: - vendors/ligo-opam-repository/rewrite-local-opam-repository.sh - - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local/" + - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local-generated/" - opam install -y --build-test --deps-only ./src/ - dune build -p ligo # TODO: also try instead from time to time: @@ -44,7 +44,7 @@ local-repo-job: <<: *before_script script: - vendors/ligo-opam-repository/rewrite-local-opam-repository.sh - - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local/" + - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local-generated/" #--build-test - opam install -y ligo diff --git a/vendors/.gitignore b/vendors/.gitignore index a8dfbc2dc..60cf0205d 100644 --- a/vendors/.gitignore +++ b/vendors/.gitignore @@ -1 +1 @@ -/ligo-opam-repository-local +/ligo-opam-repository-local-generated diff --git a/vendors/opam-repository-tools/rewrite-local-opam-repository.sh b/vendors/opam-repository-tools/rewrite-local-opam-repository.sh index 10ab030d1..9ef53e4e8 100755 --- a/vendors/opam-repository-tools/rewrite-local-opam-repository.sh +++ b/vendors/opam-repository-tools/rewrite-local-opam-repository.sh @@ -2,10 +2,10 @@ set -euET -o pipefail main(){ root_dir="$(pwd | sed -e 's/\\/\\\\/' | sed -e 's/&/\\\&/' | sed -e 's/~/\\~/')" - rm -fr vendors/ligo-opam-repository-local - mkdir vendors/ligo-opam-repository-local - cp -a index.tar.gz packages repo urls.txt vendors/ligo-opam-repository-local - cd vendors/ligo-opam-repository-local + rm -fr vendors/ligo-opam-repository-local-generated + mkdir vendors/ligo-opam-repository-local-generated + cp -a index.tar.gz packages repo urls.txt vendors/ligo-opam-repository-local-generated + cd vendors/ligo-opam-repository-local-generated git grep -z -l src: | grep -z 'opam$' | xargs -0 \ sed -i -e 's~src: *"https://gitlab.com/ligolang/ligo/-/archive/master/ligo.tar.gz"~src: "file://'"$root_dir"'"~' # TODO: run the update.sh script adequately to regenerate the index.tar.gz etc. in the local repo