diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-05-07 11:52:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-07 11:52:09 +0200 |
| commit | 30e7c88bdf02335225c7b6df0200a74e931a6a4f (patch) | |
| tree | bc04ec4667ed2259cc4ff5045b7620befd96c470 | |
| parent | 7b474e6d815900eeebcaf03e44d8d076e3ee900a (diff) | |
| parent | ef36cd015efcef463fdd8ba13f4b4598cfe3aa25 (diff) | |
Merge pull request #1419 from rouault/fix_ci
tools/travis-ci/install.sh: git clone with https:// to fix 'The unaut…
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rwxr-xr-x | tools/travis-ci/install.sh | 4 | ||||
| -rw-r--r-- | tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt (renamed from tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.3.0-x86_64-Release-3rdP.txt) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8d59e40..2007218f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,7 +127,7 @@ jobs: files: build/openjpeg-*.zip 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]')" strategy: diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 997f7bb8..26568af4 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -56,12 +56,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" diff --git a/tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.3.0-x86_64-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt index 0ed8ee4c..0ed8ee4c 100644 --- a/tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.3.0-x86_64-Release-3rdP.txt +++ b/tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt |