From 84a024db21184df4fc0f7f1a935f6a3383426581 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Sun, 7 Jan 2024 13:42:41 -0300 Subject: [PATCH] Trigger Travis-ci macOS build [skip AppVeyor] [skip linux] Continuation of ee39d19 [publish binaries] --- .travis.yml | 3 ++- travis/osx/script.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97fc4ec9e..67a25143c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,8 @@ jobs: - os: osx osx_image: xcode14.2 compiler: clang - - os: linux + - if: commit_message !~ /\[skip linux\]/ + os: linux dist: focal compiler: gcc diff --git a/travis/osx/script.sh b/travis/osx/script.sh index cff5efc7b..ae7ed20b1 100755 --- a/travis/osx/script.sh +++ b/travis/osx/script.sh @@ -4,7 +4,7 @@ set -ev if [ -z "$(ls -A src/GoldenCheetah.app)" ]; then CC=clang CXX=clang++ /usr/local/opt/qt5/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-deprecated-register -Wno-nullability-completeness -Wno-sign-compare -Wno-inconsistent-missing-override" QMAKE_CFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-sign-compare" CC=clang CXX=clang++ make qmake_all -if [ -z "$(ls -A qwt/lib)" ]; then +if [ -z "$(ls -A qwt/lib/libqwt.a)" ]; then CC=clang CXX=clang++ make -j4 sub-qwt exit # build qwt and store in the cache on the first run fi