remove the fetch reference data caching - to be done in next PR

tardis-sn · Aug 23, 2018 · 0e6cf07 · 0e6cf07
1 parent ebd95a2
commit 0e6cf07
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,13 +59,29 @@ cache:
   apt: true
   directories:
     - $HOME/miniconda
-    - $REF_DATA_HOME
+    #- $REF_DATA_HOME
 
 
 before_install:
     # We do this to make sure we get the dependencies so pip works below
     - source ci-helpers/install_miniconda.sh
-    - source ci-helpers/fetch_reference_data.sh
+    - if [[ $TEST_MODE == 'spectrum' ]]; then conda install -c conda-forge git-lfs=2.2.1 -y; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs install --skip-smudge; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git clone $TARDIS_REF_DATA_URL $HOME/tardis-refdata; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then cd $HOME/tardis-refdata; fi
+# Use the following to get the ref-data from the master;
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git checkout origin/master; fi
+# Use the following to get the ref-data from a specific pull request;
+# - if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin pull/11/head:thomson-ref; fi
+# - if [[ $TEST_MODE == 'spectrum' ]]; then git checkout thomson-ref; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="atom_data/chianti_He.h5" origin; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="plasma_reference/" origin; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="unit_test_data.h5" origin; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then cd $TRAVIS_BUILD_DIR; fi
+
+#- source ci-helpers/fetch_reference_data.sh
 
 
 install:

diff --git a/ci-helpers/fetch_reference_data.sh b/ci-helpers/fetch_reference_data.sh
@@ -9,8 +9,8 @@ git fetch origin
 git checkout origin/master
 # Use the following to get the ref-data from a specific pull request
 #git fetch origin pull/11/head:thomson-ref
-git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin
-git lfs pull --include="atom_data/chianti_He.h5" origin
-git lfs pull --include="plasma_reference/" origin
-git lfs pull --include="unit_test_data.h5" origin
+git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin/master
+git lfs pull --include="atom_data/chianti_He.h5" origin/master
+git lfs pull --include="plasma_reference/" origin/master
+git lfs pull --include="unit_test_data.h5" origin/master
 cd $TRAVIS_BUILD_DIR