Skip to content

Commit e080a4d

Browse files
author
Kyle Harrington
committed
Disable scripts that trigger update site upload until gradle populate_fiji.sh port is complete
1 parent 016036a commit e080a4d

File tree

1 file changed

+40
-39
lines changed

1 file changed

+40
-39
lines changed

travis-build.sh

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -176,45 +176,46 @@ EOL
176176
fi
177177

178178
# Configure conda environment, if one is needed.
179-
if [ -f environment.yml ]
180-
then
181-
echo travis_fold:start:scijava-conda
182-
echo "= Conda setup ="
183-
184-
condaDir=$HOME/miniconda
185-
condaSh=$condaDir/etc/profile.d/conda.sh
186-
if [ ! -f "$condaSh" ]; then
187-
echo
188-
echo "== Installing conda =="
189-
wget -nv https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
190-
rm -rf "$condaDir"
191-
bash miniconda.sh -b -p "$condaDir"
192-
checkSuccess $?
193-
fi
194-
195-
echo
196-
echo "== Updating conda =="
197-
. "$condaSh" &&
198-
conda config --set always_yes yes --set changeps1 no &&
199-
conda update -q conda &&
200-
conda info -a
201-
checkSuccess $?
202-
203-
echo
204-
echo "== Configuring environment =="
205-
condaEnv=travis-scijava
206-
test -d "$condaDir/envs/$condaEnv" && condaAction=update || condaAction=create
207-
conda env "$condaAction" -n "$condaEnv" -f environment.yml &&
208-
conda activate "$condaEnv"
209-
checkSuccess $?
210-
211-
echo
212-
echo "== Run CI code =="
213-
python3 .travis/ci.py
214-
checkSuccess $?
215-
216-
echo travis_fold:end:scijava-conda
217-
fi
179+
# TODO temporarily disabled
180+
#if [ -f environment.yml ]
181+
#then
182+
# echo travis_fold:start:scijava-conda
183+
# echo "= Conda setup ="
184+
#
185+
# condaDir=$HOME/miniconda
186+
# condaSh=$condaDir/etc/profile.d/conda.sh
187+
# if [ ! -f "$condaSh" ]; then
188+
# echo
189+
# echo "== Installing conda =="
190+
# wget -nv https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
191+
# rm -rf "$condaDir"
192+
# bash miniconda.sh -b -p "$condaDir"
193+
# checkSuccess $?
194+
# fi
195+
#
196+
# echo
197+
# echo "== Updating conda =="
198+
# . "$condaSh" &&
199+
# conda config --set always_yes yes --set changeps1 no &&
200+
# conda update -q conda &&
201+
# conda info -a
202+
# checkSuccess $?
203+
#
204+
# echo
205+
# echo "== Configuring environment =="
206+
# condaEnv=travis-scijava
207+
# test -d "$condaDir/envs/$condaEnv" && condaAction=update || condaAction=create
208+
# conda env "$condaAction" -n "$condaEnv" -f environment.yml &&
209+
# conda activate "$condaEnv"
210+
# checkSuccess $?
211+
#
212+
# echo
213+
# echo "== Run CI code =="
214+
# python3 .travis/ci.py
215+
# checkSuccess $?
216+
#
217+
# echo travis_fold:end:scijava-conda
218+
#fi
218219

219220
# Execute Jupyter notebooks.
220221
if which jupyter >/dev/null 2>/dev/null

0 commit comments

Comments
 (0)