Call .travis/ci.py after conda env is setup (but inside bash script)

scenerygraphics · Aug 14, 2020 · 4854222 · 4854222
1 parent 2a5bbaf
commit 4854222
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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