aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2020-03-08 11:00:11 +0100
committerAvatar Marvin Schmidt <marv@exherbo.org> 2020-03-10 06:05:46 +0100
commit6d07b25cc4b7debf29425c163f02ad9036f5874e (patch)
treeabe61e292717216c8cf026bc5c243025456da085
parentfe566c952905b51e9eebd7419a85e162e01a25b6 (diff)
downloadpaludis-6d07b25cc4b7debf29425c163f02ad9036f5874e.tar.gz
paludis-6d07b25cc4b7debf29425c163f02ad9036f5874e.tar.xz
ci: exherbo: Use long-options for `cave resolve`
-rw-r--r--ci/docker/exherbo/paludis-exherbo-clang/Dockerfile9
-rw-r--r--ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile9
2 files changed, 14 insertions, 4 deletions
diff --git a/ci/docker/exherbo/paludis-exherbo-clang/Dockerfile b/ci/docker/exherbo/paludis-exherbo-clang/Dockerfile
index 66aabf259..3bac9b6b8 100644
--- a/ci/docker/exherbo/paludis-exherbo-clang/Dockerfile
+++ b/ci/docker/exherbo/paludis-exherbo-clang/Dockerfile
@@ -12,8 +12,13 @@ RUN chgrp tty /dev/tty \
&& eclectic env update \
&& source /etc/profile \
&& cave resolve -1z repository/{media,pyro,scientific} -x \
- && cave resolve -1z -Ks -ks -x \
- -o dev-python/sphinxcontrib-websupport \
+ && cave resolve \
+ --execute \
+ --preserve-world \
+ --lazy \
+ --keep-targets if-same \
+ --keep if-same \
+ --permit-old-version dev-python/sphinxcontrib-websupport \
--recommendations ignore \
--suggestions ignore \
paludis-deps
diff --git a/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile b/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile
index f625170b5..1e0331ed4 100644
--- a/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile
+++ b/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile
@@ -17,8 +17,13 @@ RUN chgrp tty /dev/tty \
&& eclectic env update \
&& source /etc/profile \
&& cave resolve -1z repository/{media,pyro,python,scientific,x11} -x \
- && cave resolve -1z -Ks -ks -x \
- -o dev-python/sphinxcontrib-websupport \
+ && cave resolve \
+ --execute \
+ --preserve-world \
+ --lazy \
+ --keep-targets if-same \
+ --keep if-same \
+ --permit-old-version dev-python/sphinxcontrib-websupport \
--recommendations ignore \
--suggestions ignore \
paludis-deps