X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F10_before_install.bash;h=6780a8eea81a850b84dcd640cf49abcea9ce273c;hb=3b7ea110ea6e400d497b05e8e366db10e30abfdb;hp=374ed6e749de1a940d06a2ea88d9c8e5f003c828;hpb=cdd6fc401769022b829bf00f5be55685d58df15e;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 374ed6e..6780a8e 100755
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -16,7 +16,7 @@ $(free -m -t)
 
 CI_VM_MIN_FREE_MB=2000
 if [[ "$(free -m | grep 'buffers/cache:' | perl -p -e '$_ = (split /\s+/, $_)[3]')" -lt "$CI_VM_MIN_FREE_MB" ]]; then
-  SHORT_CIRCUIT_SMOKE=1
+  export SHORT_CIRCUIT_SMOKE=1
   echo_err "
 =============================================================================
 
@@ -154,14 +154,9 @@ FileUsage       = 1
 
 ### config oracle
   if [[ "$DBICTEST_ORA" = "true" ]]; then
-    run_or_err "Installing dummy multiarch bc package" '
-      bc_tempdir="$(mktemp -d)"
-      wget -O "$bc_tempdir/bc-multiarch_1.0_all.deb" -q http://ilmari.org/bc-multiarch/bc-multiarch_1.0_all.deb
-      sudo dpkg -i "$bc_tempdir/bc-multiarch_1.0_all.deb" || sudo bash -c "source maint/travis-ci_scripts/common.bash && apt_install -f"
-    '
-
-    run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --single-branch --branch=oracle/10.2.0 https://github.com/poortravis/poormanscache.git $CACHE_DIR && $CACHE_DIR/reassemble"
-    run_or_err "Installing OracleXE manually from deb" "sudo dpkg -i $CACHE_DIR/apt_cache/oracle-xe_10.2.0.1-1.1_i386.deb || sudo bash -c 'source maint/travis-ci_scripts/common.bash && apt_install -f'"
+    run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --single-branch --branch=oracle/10.2.0 https://github.com/poormanscache/poormanscache.git $CACHE_DIR && $CACHE_DIR/reassemble"
+    run_or_err "Installing OracleXE manually from deb" \
+      "sudo dpkg -i $CACHE_DIR/apt_cache/bc-multiarch-travis_1.0_all.deb $CACHE_DIR/apt_cache/oracle-xe_10.2.0.1-1.1_i386.deb || sudo bash -c 'source maint/travis-ci_scripts/common.bash && apt_install -f'"
 
     SRV_ORA_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/server