From: D. Ilmari Mannsåker Date: Mon, 25 Jan 2016 12:46:45 +0000 (+0000) Subject: (trv) Get bc-multiarch from Github X-Git-Tag: 0.07046~16 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3b7ea110ea6e400d497b05e8e366db10e30abfdb;hp=dc783fab900d073db1fb0e86b709cbb65bd364b7;p=dbsrgits%2FDBIx-Class-Schema-Loader.git (trv) Get bc-multiarch from Github --- diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash index 3db9fc2..6780a8e 100755 --- a/maint/travis-ci_scripts/10_before_install.bash +++ b/maint/travis-ci_scripts/10_before_install.bash @@ -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