diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rwxr-xr-x | tools/travis-ci/install.sh | 7 | ||||
| -rw-r--r-- | tools/travis-ci/knownfailures-Ubuntu22.04-gcc11.3.0-x86_64-Release-3rdP.txt | 6 | ||||
| -rwxr-xr-x | tools/travis-ci/run.sh | 4 |
4 files changed, 7 insertions, 12 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2007218f..d5d3f68c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: - name: Install Requirements run: | sudo apt update - sudo apt install -y gcc g++ + sudo apt install -y gcc g++ python-is-python3 - name: Build and run tests run: | diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 26568af4..29453986 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -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) diff --git a/tools/travis-ci/knownfailures-Ubuntu22.04-gcc11.3.0-x86_64-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu22.04-gcc11.3.0-x86_64-Release-3rdP.txt new file mode 100644 index 00000000..0ed8ee4c --- /dev/null +++ b/tools/travis-ci/knownfailures-Ubuntu22.04-gcc11.3.0-x86_64-Release-3rdP.txt @@ -0,0 +1,6 @@ +NR-DEC-_00042.j2k-2-decode-md5 +NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5 +NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5 +NR-DEC-issue205.jp2-43-decode-md5 +NR-DEC-issue135.j2k-68-decode-md5 +NR-DEC-issue208.jp2-69-decode-md5 diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index fcdea9e6..a3d2b4e4 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -221,10 +221,6 @@ Note: Binaries can only be used for non-commercial purposes. " fi -if [ -d cmake-install ]; then - export PATH=${PWD}/cmake-install/bin:${PATH} -fi - set -x # This will print configuration # travis-ci doesn't dump cmake version in system info, let's print it |