Fix CI

[openjpeg.git] / tools / travis-ci / install.sh

diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh
index 149a1af601d8d6b6e1e2d21bced5b87f1c9e17f5..2945398615300477e8717b1b32cc6e65b26ddffd 100755 (executable)
--- a/tools/travis-ci/install.sh
+++ b/tools/travis-ci/install.sh
@@ -35,36 +35,31 @@ if [ "${COVERITY_SCAN_BRANCH:-}" == "1" ] || [ "${OPJ_CI_ABI_CHECK:-}" == "1" ];
        exit 0
 fi
 
-if [ "${OPJ_CI_ASAN:-}" == "1" ]; then
-       # We need a new version of cmake than travis-ci provides
-       wget --no-check-certificate -qO - https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz | tar -xz
-       # copy to a directory that will not changed every version
-       mv cmake-3.5.2-Linux-x86_64 cmake-install
-fi
-
 if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
 
        OPJ_SOURCE_DIR=$(cd $(dirname $0)/../.. && pwd)
 
        # We need test data
-       if [ "${TRAVIS_BRANCH:-}" != "" ]; then
+       if [ "${GITHUB_HEAD_REF:-}" != "" ]; then
+               OPJ_DATA_BRANCH=${GITHUB_HEAD_REF}
+       elif [ "${TRAVIS_BRANCH:-}" != "" ]; then
                OPJ_DATA_BRANCH=${TRAVIS_BRANCH}
        elif [ "${APPVEYOR_REPO_BRANCH:-}" != "" ]; then
                OPJ_DATA_BRANCH=${APPVEYOR_REPO_BRANCH}
        else
                OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up
        fi
-       OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads git://github.com/uclouvain/openjpeg-data.git ${OPJ_DATA_BRANCH} | wc -l)
+       OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads https://github.com/uclouvain/openjpeg-data ${OPJ_DATA_BRANCH} | wc -l)
        if [ ${OPJ_DATA_HAS_BRANCH} -eq 0 ]; then
                OPJ_DATA_BRANCH=master #default to master
        fi
        echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch"
-       git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data
+       git clone -v --depth=1 --branch=${OPJ_DATA_BRANCH} https://github.com/uclouvain/openjpeg-data data
 
        # We need jpylyzer for the test suite
     JPYLYZER_VERSION="1.17.0"    
        echo "Retrieving jpylyzer"
-       if [ "${APPVEYOR:-}" == "True" ]; then
+       if [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows" ]; then
                wget -q https://github.com/openpreserve/jpylyzer/releases/download/${JPYLYZER_VERSION}/jpylyzer_${JPYLYZER_VERSION}_win32.zip
                mkdir jpylyzer
                cd jpylyzer
@@ -82,12 +77,12 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
        # so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.
        # Note: Binaries can only be used for non-commercial purposes.
        if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then
-               if [ "${TRAVIS_OS_NAME:-}" == "linux" ] || uname -s | grep -i Linux &> /dev/null; then
+               if [ "${TRAVIS_OS_NAME:-}" == "linux" -o "${RUNNER_OS:-}" == "Linux" ] || uname -s | grep -i Linux &> /dev/null; then
                        echo "Retrieving Kakadu"
                        wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Linux-x86-64_200602.zip
                        cmake -E tar -xf KDU805_Demo_Apps_for_Linux-x86-64_200602.zip
                        mv KDU805_Demo_Apps_for_Linux-x86-64_200602 kdu
-               elif [ "${TRAVIS_OS_NAME:-}" == "osx" ] || uname -s | grep -i Darwin &> /dev/null; then
+               elif [ "${TRAVIS_OS_NAME:-}" == "osx"  -o "${RUNNER_OS:-}" == "macOS" ] || uname -s | grep -i Darwin &> /dev/null; then
                        echo "Retrieving Kakadu"
                        wget -v http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip
                        cmake -E tar -xf KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip
@@ -102,7 +97,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
                        install_name_tool -id ${PWD}/libkdu_v80R.dylib libkdu_v80R.dylib 
                        install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_compress
                        install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_expand
-               elif [ "${APPVEYOR:-}" == "True" ] || uname -s | grep -i MINGW &> /dev/null || uname -s | grep -i CYGWIN &> /dev/null; then
+               elif [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows"  ] || uname -s | grep -i MINGW &> /dev/null || uname -s | grep -i CYGWIN &> /dev/null; then
                        echo "Retrieving Kakadu"
                        wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Win64_200602.msi_.zip
                        cmake -E tar -xf KDU805_Demo_Apps_for_Win64_200602.msi_.zip