From 4854222d9af9bcdf4d194be0710e498672ddd5b5 Mon Sep 17 00:00:00 2001
From: Kyle IS Harrington <kyle.i.s.harrington@gmail.com>
Date: Fri, 14 Aug 2020 11:56:05 -0400
Subject: [PATCH] Call .travis/ci.py after conda env is setup (but inside bash
 script)

---
 .travis.yml     | 4 ++--
 travis-build.sh | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 813cf7eb..19d030c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ install: true
 script:
 #- ".travis/build.sh"
 - "python3 .travis/pre_ci.py"
-- "conda activate scijava-conda"
-- "conda activate scijava-conda; python3 .travis/ci.py"
+# .travis/ci.py is now called from travis_build.sh, which is called by pre_ci.py ^^^
+#- "conda activate scijava-conda; python3 .travis/ci.py"
 cache:
   directories:
   - "~/.m2/repository"
diff --git a/travis-build.sh b/travis-build.sh
index e2b42888..09d6ed19 100644
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -208,6 +208,10 @@ then
 	conda activate "$condaEnv"
 	checkSuccess $?
 
+	echo
+	echo "== Run CI code =="
+	python3 .travis/ci.py
+
 	echo travis_fold:end:scijava-conda
 fi