From 7cc0277779349de80804378907aacf9ec6b463c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Wed, 29 Jan 2020 14:14:36 +0100 Subject: [PATCH 1/2] Config pkg.benchmark for benchmark package --- .travis.yml | 21 ++++++++++----------- appveyor.yml | 13 ++++++------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index c05b8159b..dc5eab2b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,37 +37,37 @@ matrix: - os: linux env: > TOOLCHAIN=clang-cxx17 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: linux env: > TOOLCHAIN=gcc-7-cxx17 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: linux env: > TOOLCHAIN=android-ndk-r17-api-24-arm64-v8a-clang-libcxx14 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: linux env: > TOOLCHAIN=analyze-cxx17 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: linux env: > TOOLCHAIN=sanitize-address-cxx17 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: linux env: > TOOLCHAIN=sanitize-leak-cxx17 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: linux env: > TOOLCHAIN=sanitize-thread-cxx17 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark # } @@ -77,19 +77,19 @@ matrix: osx_image: xcode9.4 env: > TOOLCHAIN=osx-10-13-make-cxx14 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: osx osx_image: xcode9.4 env: > TOOLCHAIN=osx-10-13-cxx14 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark - os: osx osx_image: xcode9.4 env: > TOOLCHAIN=ios-nocodesign-11-4-dep-9-3 - PROJECT_DIR=examples/foo + PROJECT_DIR=examples/benchmark # } @@ -142,5 +142,4 @@ script: branches: except: - pkg.template - - /^pr\..*/ - /^v[0-9]+\.[0-9]+\.[0-9]+$/ diff --git a/appveyor.yml b/appveyor.yml index 534ba24f1..734b12c9e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,27 +9,27 @@ environment: matrix: - TOOLCHAIN: "ninja-vs-15-2017-win64-cxx17" - PROJECT_DIR: examples\foo + PROJECT_DIR: examples\benchmark APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLCHAIN: "nmake-vs-15-2017-win64-cxx17" - PROJECT_DIR: examples\foo + PROJECT_DIR: examples\benchmark APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLCHAIN: "vs-15-2017-win64-cxx17" - PROJECT_DIR: examples\foo + PROJECT_DIR: examples\benchmark APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLCHAIN: "vs-14-2015-sdk-8-1" - PROJECT_DIR: examples\foo + PROJECT_DIR: examples\benchmark APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLCHAIN: "mingw-cxx17" - PROJECT_DIR: examples\foo + PROJECT_DIR: examples\benchmark APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLCHAIN: "msys-cxx17" - PROJECT_DIR: examples\foo + PROJECT_DIR: examples\benchmark APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 install: @@ -80,5 +80,4 @@ build_script: branches: except: - pkg.template - - /^pr\..*/ - /^v[0-9]+\.[0-9]+\.[0-9]+$/ From fdba56830ce19b10a6e60c137a85a92e8f366827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Wed, 29 Jan 2020 14:32:03 +0100 Subject: [PATCH 2/2] benchmark: Disable broken analyze-cxx17 toolchain --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc5eab2b4..9729286d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,10 +49,12 @@ matrix: TOOLCHAIN=android-ndk-r17-api-24-arm64-v8a-clang-libcxx14 PROJECT_DIR=examples/benchmark - - os: linux - env: > - TOOLCHAIN=analyze-cxx17 - PROJECT_DIR=examples/benchmark + # FIXME: Clang analyzer reports problems. + # https://travis-ci.org/chfast/hunter/jobs/643376250 + # - os: linux + # env: > + # TOOLCHAIN=analyze-cxx17 + # PROJECT_DIR=examples/benchmark - os: linux env: >