From 8821e6c01e1c231698cca922fd597a1c26926e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Wed, 15 May 2019 16:41:24 +0200 Subject: [PATCH] Rewrite local opam repository into a different folder and .gitignore it --- .gitlab-ci.yml | 4 ++-- vendors/.gitignore | 1 + vendors/ligo-opam-repository | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 vendors/.gitignore diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bba02f83..b9b6da3ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ before_script: local-dune-job: script: - vendors/ligo-opam-repository/rewrite-local-opam-repository.sh - - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository/" + - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local/" - opam install -y --build-test --deps-only ./src/ - (dune build -p ligo) # TODO: also try instead from time to time: @@ -47,7 +47,7 @@ local-dune-job: local-repo-job: script: - vendors/ligo-opam-repository/rewrite-local-opam-repository.sh - - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository/" + - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local/" #--build-test - opam install -y ligo diff --git a/vendors/.gitignore b/vendors/.gitignore new file mode 100644 index 000000000..a8dfbc2dc --- /dev/null +++ b/vendors/.gitignore @@ -0,0 +1 @@ +/ligo-opam-repository-local diff --git a/vendors/ligo-opam-repository b/vendors/ligo-opam-repository index c794c6169..2b4eaa29d 160000 --- a/vendors/ligo-opam-repository +++ b/vendors/ligo-opam-repository @@ -1 +1 @@ -Subproject commit c794c6169960fd6d625ec2eb292f4136ec276f99 +Subproject commit 2b4eaa29d1c4066ddaba047216e27719ea737581