From af4fd8d317c161b2b08380c3fb08fbe357715eb5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 7 May 2022 10:55:00 +0200 Subject: [PATCH 1/3] tools/travis-ci/install.sh: git clone with https:// to fix 'The unauthenticated git protocol on port 9418 is no longer supported.' --- tools/travis-ci/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From f7b5310e66d6c45253ac973af8138955b8071488 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 7 May 2022 11:05:04 +0200 Subject: [PATCH 2/3] .github/workflows/build.yml: force use of windows-2019 VM --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From ef36cd015efcef463fdd8ba13f4b4598cfe3aa25 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 7 May 2022 11:14:52 +0200 Subject: [PATCH 3/3] Rename knownfailures-Ubuntu20.04-gcc9.3.0-x86_64-Release-3rdP.txt to knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt --- ...=> knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/travis-ci/{knownfailures-Ubuntu20.04-gcc9.3.0-x86_64-Release-3rdP.txt => knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt} (100%) 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 similarity index 100% rename from tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.3.0-x86_64-Release-3rdP.txt rename to tools/travis-ci/knownfailures-Ubuntu20.04-gcc9.4.0-x86_64-Release-3rdP.txt