diff --git a/.travis.yml.mustache b/.travis.yml.mustache index 7e8467c..e6f4df0 100644 --- a/.travis.yml.mustache +++ b/.travis.yml.mustache @@ -35,13 +35,13 @@ language: shell set -ex sudo chown -R coq:coq /home/coq/${PACKAGE} opam install ${PACKAGE} -v -y -j ${NJOBS} -{{# ci_test_dependants }} +{{# ci_test_dependants.enabled }} PINS=$(opam list -s --pinned --columns=package | xargs | tr ' ' ,) - PACKAGES=`opam list -s --depends-on {{ opam_name }}{{^ opam_name }}coq-{{ shortname }}{{/ opam_name }} --coinstallable-with $PINS` + PACKAGES="{{# ci_test_dependants.packages }}{{.}} {{/ ci_test_dependants.packages }}" if [ -n "$PACKAGES" ] then opam install -t $PACKAGES fi -{{/ ci_test_dependants }} +{{/ ci_test_dependants.enabled }} " - docker stop COQ # optional - echo -en 'travis_fold:end:script\\r' diff --git a/config.yml.mustache b/config.yml.mustache index 062df97..ce6ba2f 100644 --- a/config.yml.mustache +++ b/config.yml.mustache @@ -41,18 +41,18 @@ jobs: name: Build, test, and install package command: opam install -t . {{& circleci_after_script }} -{{# ci_test_dependants }} +{{# ci_test_dependants.enabled }} - run: name: Test dependants command: | PINS=$(opam list -s --pinned --columns=package | xargs | tr ' ' ,) - PACKAGES=`opam list -s --depends-on {{ opam_name }}{{^ opam_name }}coq-{{ shortname }}{{/ opam_name }} --coinstallable-with $PINS` + PACKAGES="{{# ci_test_dependants.packages }}{{.}} {{/ ci_test_dependants.packages }}" for PACKAGE in $PACKAGES do DEPS_FAILED=false opam install --deps-only $PACKAGE || DEPS_FAILED=true [ $DEPS_FAILED == true ] || opam install -t $PACKAGE done -{{/ ci_test_dependants }} +{{/ ci_test_dependants.enabled }} - run: name: Uninstall package command: opam uninstall . diff --git a/docker-action.yml.mustache b/docker-action.yml.mustache index a113724..c9cc594 100644 --- a/docker-action.yml.mustache +++ b/docker-action.yml.mustache @@ -47,18 +47,18 @@ jobs: opam config list; opam repo list; opam list endGroup <%/ ci_extra_dev %> -<%# ci_test_dependants %> +<%# ci_test_dependants.enabled %> after_script: | startGroup "Test dependants" PINS=$(opam list -s --pinned --columns=package | xargs | tr ' ' ,) - PACKAGES=`opam list -s --depends-on <% opam_name %><%^ opam_name %>coq-<% shortname %><%/ opam_name %> --coinstallable-with $PINS` + PACKAGES="<%# ci_test_dependants.packages %><%.%> <%/ ci_test_dependants.packages %>" for PACKAGE in $PACKAGES do DEPS_FAILED=false - opam install -y --deps-only $PACKAGE || DEPS_FAILED=true + opam install -y -t --deps-only $PACKAGE || DEPS_FAILED=true [ $DEPS_FAILED == true ] || opam install -t $PACKAGE done endGroup -<%/ ci_test_dependants %> +<%/ ci_test_dependants.enabled %> <%& action_appendix %> # See also: diff --git a/ref.yml b/ref.yml index e8bb35a..580917e 100644 --- a/ref.yml +++ b/ref.yml @@ -75,11 +75,15 @@ fields: - README.md - .travis.yml - ci_test_dependants: - type: bool used: - config.yml - .travis.yml - docker-action.yml + item_fields: + - name: enabled + type: bool + - name: packages + type: list - ci_extra_dev: type: bool description: >