Fix CI
[openjpeg.git] / tools / travis-ci / install.sh
index 997f7bb86a6dc5f799f26eb6a0481ffd559bb9eb..2945398615300477e8717b1b32cc6e65b26ddffd 100755 (executable)
@@ -35,13 +35,6 @@ 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)
@@ -56,12 +49,12 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
        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 -v --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"