From 9f78cd104175b4a72c503801f54e9e766c80f3c4 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Thu, 7 Mar 2019 09:40:17 -0500 Subject: [PATCH] Updating method for getting latest tag --- .travis.yml | 4 +--- tools/before-test.sh | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0dbafd9..fc37c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,7 @@ before_install: - sudo apt-get -qq update - eval "${MATRIX_EVAL}" -install: - - sudo apt-get install jq - - jq --help +#install: # - sudo apt-get install -y libboost-test-dev # - sudo apt-get install -y libboost-thread-dev diff --git a/tools/before-test.sh b/tools/before-test.sh index d4f3187..155cbc1 100755 --- a/tools/before-test.sh +++ b/tools/before-test.sh @@ -21,6 +21,7 @@ # GitHub and stages the files for nrtest to run. The script assumes that # before-test.sh and gen-config.sh are located together in the same folder. + if [ -z $1 ]; then unset PLATFORM; else @@ -61,13 +62,10 @@ SUT_PATH=(`find $BUILD_HOME -name "bin" -type d`) # TODO: determine platform -# determine latest tag from GitHub API -LATEST_URL="https://api.github.com/repos/openwateranalytics/epanet-example-networks/releases/latest" -LATEST_TAG=(`curl ${LATEST_URL} | jq -r .tag_name`) -if [ ${LATEST_TAG} == 'null' ]; then - echo "ERROR: curl | jq - ${LATEST_URL}" - exit 1 -fi +# hack to determine latest tag from GitHub +LATEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/latest" +temp_url=$(curl -sI ${LATEST_URL} | grep -iE "^Location:") +LATEST_TAG=$(echo ${temp_url##*/}) TEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/${LATEST_TAG}.tar.gz" BENCH_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/${LATEST_TAG}/benchmark-${PLATFORM}-${REF_BUILD_ID}.tar.gz"