From a151a6a7a77ff14ebd2add5462befc2160bd48d7 Mon Sep 17 00:00:00 2001
From: Yishuai Li <yishuai@upenn.edu>
Date: Tue, 26 May 2020 17:54:48 -0400
Subject: [PATCH] Apply suggestions from code review

---
 .travis.yml.mustache | 1 +
 config.yml.mustache  | 4 +++-
 generate.sh          | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.travis.yml.mustache b/.travis.yml.mustache
index a9e21f2..921e7a2 100644
--- a/.travis.yml.mustache
+++ b/.travis.yml.mustache
@@ -14,6 +14,7 @@ language: shell
       echo \"Build triggered by ${TRAVIS_EVENT_TYPE}\"
       export PS4='+ \e[33;1m(\$0 @ line \$LINENO) \$\e[0m '
       set -ex  # -e = exit on failure; -x = trace for debug
+      opam repo -a --set-default add coq-extra-dev https://coq.inria.fr/opam/extra-dev
       opam update -y
       opam pin add ${PACKAGE} . -y -n -k path
       opam install ${PACKAGE} -y -j ${NJOBS} --deps-only
diff --git a/config.yml.mustache b/config.yml.mustache
index 62b24ac..7bd1e04 100644
--- a/config.yml.mustache
+++ b/config.yml.mustache
@@ -24,7 +24,7 @@ jobs:
     - run:
         name: Install dependencies
         command: |
-          opam repo -a add coq-extra-dev https://coq.inria.fr/opam/extra-dev
+          opam repo -a --set-default add coq-extra-dev https://coq.inria.fr/opam/extra-dev
           opam update
           opam install --deps-only .
     - run:
@@ -33,6 +33,7 @@ jobs:
     - run:
         name: Build, test, and install package
         command: opam install -t .
+{{# ci_test_dependants }}
     - run:
         name: Test dependants
         command: |
@@ -41,6 +42,7 @@ jobs:
           if ! [ -z "$PACKAGES" ]
           then opam install -t $PACKAGES
           fi
+{{/ ci_test_dependants }}
     - run:
         name: Uninstall package
         command: opam uninstall .
diff --git a/generate.sh b/generate.sh
index 452c2b5..346b6f6 100755
--- a/generate.sh
+++ b/generate.sh
@@ -51,6 +51,15 @@ for f in "$srcdir"/{,.}*.mustache; do
                 continue
             fi
             ;;
+	config.yml)
+	    mustache='{{ circleci }}'
+	    bool=$(get_yaml meta.yml <<<"$mustache")
+            if [ -n "$bool" ] && [ "$bool" != false ]; then
+                mkdir -p -v .circleci && target=".circleci/$target"
+            else
+                continue
+            fi
+            ;;
         default.nix)
             mustache='{{ tested_coq_nix_versions }}'
             bool=$(get_yaml meta.yml <<<"$mustache")