From 534b0c9941ef90f47a1044c918426a62b9f41dae Mon Sep 17 00:00:00 2001 From: clanmills Date: Fri, 11 Sep 2020 09:02:08 +0100 Subject: [PATCH 01/12] Do not build WebReady with Visual Studio. --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 68ce0000..65723db6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: True + WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: Ninja @@ -21,7 +21,7 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: True + WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: Ninja @@ -30,7 +30,7 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: True + WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: Ninja From 6ddb1f63df9b147ef244b2c2fd35a1026df680e0 Mon Sep 17 00:00:00 2001 From: clanmills Date: Fri, 11 Sep 2020 09:02:41 +0100 Subject: [PATCH 02/12] Build with C++11 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a8bffec..bfaf62d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COVERAGE=1 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + env: COVERAGE=1 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=ON -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: xenial @@ -18,18 +18,18 @@ matrix: compiler: gcc env: - WITH_VALGRIND=1 - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: xenial sudo: required compiler: clang - env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: osx osx_image: xcode11.3 compiler: clang - env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" install: ./ci/install.sh script: ./ci/run.sh From 9fb0df5f5366e1929f6b8882d7f0b86bfc4caacd Mon Sep 17 00:00:00 2001 From: clanmills Date: Fri, 11 Sep 2020 09:29:52 +0100 Subject: [PATCH 03/12] Disable coverage (see #1297) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfaf62d8..5e354e06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COVERAGE=1 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=ON -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: COVERAGE=0 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: xenial From f483ed03a784a24a5d5bfc44a29a74d124092b79 Mon Sep 17 00:00:00 2001 From: clanmills Date: Fri, 11 Sep 2020 14:33:44 +0100 Subject: [PATCH 04/12] Tweak conversion.sh for TZ conversion error in MSVC. --- test/conversions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conversions.sh b/test/conversions.sh index af88621e..bf1fcd12 100755 --- a/test/conversions.sh +++ b/test/conversions.sh @@ -206,7 +206,7 @@ fi # evade this test on MSVC builds (Issue #485) platform=$(runTest exiv2 -vV 2>/dev/null | grep platform=) if [ "$platform" == "platform=windows" -o "$platform" == "platform=mingw64" -o "$platform" == "platform=msys" ]; then - runTest exiv2 -PEkycv v.jpg | sed -E -e 's#17 19:10:22#18 02:10:22#g' + runTest exiv2 -PEkycv v.jpg | sed -E -e 's#1. 1.:10:22#18 02:10:22#g' else runTest exiv2 -PEkycv v.jpg fi From 14e8c708ed2e9980033ad05da69f2c4799dab5b0 Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 13 Sep 2020 10:27:02 +0100 Subject: [PATCH 05/12] Fix #1300 --- .travis.yml | 8 ++++---- tests/bash_tests/utils.py | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e354e06..83391951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COVERAGE=0 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: COVERAGE=0 CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: xenial @@ -18,18 +18,18 @@ matrix: compiler: gcc env: - WITH_VALGRIND=1 - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" + - CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: xenial sudo: required compiler: clang - env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: osx osx_image: xcode11.3 compiler: clang - env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" install: ./ci/install.sh script: ./ci/run.sh diff --git a/tests/bash_tests/utils.py b/tests/bash_tests/utils.py index 6a3005a1..4bb7f61c 100644 --- a/tests/bash_tests/utils.py +++ b/tests/bash_tests/utils.py @@ -290,7 +290,7 @@ class HttpServer: log.info('Starting HTTP server ...') self.proc = multiprocessing.Process(target=self._start, name=str(self)) self.proc.start() - time.sleep(1) + time.sleep(2) try: with request.urlopen('http://127.0.0.1:{}'.format(self.port), timeout=3) as f: if f.status != 200: @@ -410,7 +410,9 @@ class Executer: # Execute the command in subprocess try: - with subprocess.Popen(self.args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=stderr, cwd=self.cwd) as self.subprocess: + my_env = os.environ.copy() + my_env['TZ'] = 'GMT-8' + with subprocess.Popen(self.args,env=my_env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=stderr, cwd=self.cwd) as self.subprocess: try: output = self.subprocess.communicate(self.stdin, timeout=10) # Assign (stdout, stderr) to output except subprocess.TimeoutExpired: From 79c83d1852267334bb0faf507bd989c5abaa3613 Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 13 Sep 2020 11:08:44 +0100 Subject: [PATCH 06/12] Use ubuntu on CI --- .travis.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83391951..668a24e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,27 +7,21 @@ git: matrix: include: - os: linux - dist: xenial + dist: ubuntu sudo: required compiler: gcc env: COVERAGE=0 CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux - dist: xenial + dist: ubuntu sudo: required compiler: gcc env: - WITH_VALGRIND=1 - CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - - os: linux - dist: xenial - sudo: required - compiler: clang - env: CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - - os: osx - osx_image: xcode11.3 + osx_image: xcode11.7 compiler: clang env: CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" From 15f8050158a533b31b888fa325f561e2957d9d8d Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 13 Sep 2020 13:57:20 +0100 Subject: [PATCH 07/12] Remove .. from CMAKE_OPTIONS. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 668a24e7..29c19c15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: dist: ubuntu sudo: required compiler: gcc - env: COVERAGE=0 CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: COVERAGE=0 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: ubuntu @@ -18,12 +18,12 @@ matrix: compiler: gcc env: - WITH_VALGRIND=1 - - CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: osx osx_image: xcode11.7 compiler: clang - env: CMAKE_OPTIONS=".. -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" install: ./ci/install.sh script: ./ci/run.sh From c50cf7d88de94503c64187d0bdc66ff438706c4f Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 13 Sep 2020 14:23:57 +0100 Subject: [PATCH 08/12] -CMAKE_CXX_STANDARD=98 and Disable UNIT_TESTS. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29c19c15..9c96a19a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: dist: ubuntu sudo: required compiler: gcc - env: COVERAGE=0 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: COVERAGE=0 CMAKE_OPTIONS="-CMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: ubuntu @@ -18,7 +18,7 @@ matrix: compiler: gcc env: - WITH_VALGRIND=1 - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + - CMAKE_OPTIONS="-CMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: osx osx_image: xcode11.7 From b4aa32988a941ca2533f66e87caa393d13f69b0b Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 13 Sep 2020 14:48:10 +0100 Subject: [PATCH 09/12] Simplify ci/run.sh --- ci/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 52574802..61903b5d 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -8,7 +8,7 @@ source conan/bin/activate if [[ "$(uname -s)" == 'Linux' ]]; then if [ "$CC" == "clang" ]; then # clang + Ubuntu don't like to run with UBSAN, but ASAN works - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=\"-fsanitize=address\" -DCMAKE_C_FLAGS=\"-fsanitize=address\" -DCMAKE_EXE_LINKER_FLAGS=\"-fsanitize=address\" -DCMAKE_MODULE_LINKER_FLAGS=\"-fsanitize=address\"" + export CMAKE_OPTIONS="$CMAKE_OPTIONS" elif [ -n "$WITH_VALGRIND" ]; then export EXIV2_VALGRIND="valgrind --quiet" else @@ -23,7 +23,7 @@ mkdir build cd build conan install .. -o webready=True --build missing cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install .. -make -j 2 +make -j make tests make install From 84400dbac0eb70b2611f549ed99bccb72f50cdd8 Mon Sep 17 00:00:00 2001 From: clanmills Date: Tue, 15 Sep 2020 09:34:55 +0100 Subject: [PATCH 10/12] Don't use ASAN on CI. --- ci/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 61903b5d..9ebb65a3 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -12,10 +12,10 @@ if [[ "$(uname -s)" == 'Linux' ]]; then elif [ -n "$WITH_VALGRIND" ]; then export EXIV2_VALGRIND="valgrind --quiet" else - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" + export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=OFF" fi else - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" + export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=OFF" fi CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=-Wno-deprecated" From d4db8e4e428596c8db07d4ded37fd54c79779b58 Mon Sep 17 00:00:00 2001 From: clanmills Date: Tue, 15 Sep 2020 14:38:19 +0100 Subject: [PATCH 11/12] -DCMAKE fix. Thanks @piponazo --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c96a19a..fcfeabd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: dist: ubuntu sudo: required compiler: gcc - env: COVERAGE=0 CMAKE_OPTIONS="-CMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + env: COVERAGE=0 CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux dist: ubuntu @@ -18,7 +18,7 @@ matrix: compiler: gcc env: - WITH_VALGRIND=1 - - CMAKE_OPTIONS="-CMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" + - CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: osx osx_image: xcode11.7 From 7c895dd69f077aacc1d00a5feac8f53dcbe2b5e9 Mon Sep 17 00:00:00 2001 From: clanmills Date: Tue, 15 Sep 2020 17:14:03 +0100 Subject: [PATCH 12/12] Disable Fedora/CentOS/Archlinux on gitlab/CI. --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebbb2876..da665139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,10 @@ stages: - test - deploy -Fedora: - image: fedora:latest - <<: *default_config - <<: *distro_build +# Fedora: +# image: fedora:latest +# <<: *default_config +# <<: *distro_build Fedora_MinGW: image: fedora:latest @@ -49,20 +49,20 @@ Debian: <<: *default_config <<: *distro_build -Archlinux: - image: archlinux/base - <<: *default_config - <<: *distro_build +# Archlinux: +# image: archlinux/base +# <<: *default_config +# <<: *distro_build Ubuntu: image: ubuntu:18.04 <<: *default_config <<: *distro_build -CentOS: - image: centos:7 - <<: *default_config - <<: *distro_build +# CentOS: +# image: centos:7 +# <<: *default_config +# <<: *distro_build OpenSUSE: image: opensuse/tumbleweed