Merge pull request #1419 from rouault/fix_ci

tools/travis-ci/install.sh: git clone with https:// to fix 'The unaut…
This commit is contained in:
Even Rouault 2022-05-07 11:52:09 +02:00 committed by GitHub
commit 30e7c88bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -127,7 +127,7 @@ jobs:
files: build/openjpeg-*.zip files: build/openjpeg-*.zip
windows_build: windows_build:
runs-on: windows-latest runs-on: windows-2019
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
strategy: strategy:

View File

@ -56,12 +56,12 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
else else
OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up
fi 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 if [ ${OPJ_DATA_HAS_BRANCH} -eq 0 ]; then
OPJ_DATA_BRANCH=master #default to master OPJ_DATA_BRANCH=master #default to master
fi fi
echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch" 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 # We need jpylyzer for the test suite
JPYLYZER_VERSION="1.17.0" JPYLYZER_VERSION="1.17.0"