From 39834556d2e83406b5ee3be4f85b05044908a418 Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Sat, 18 May 2019 13:00:51 +0200 Subject: [PATCH 1/3] ci: mojave --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0301c55..302635b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,6 +138,14 @@ elcapitan-relwithdebinfo-compile: variables: BUILD_TYPE: RelWithDebInfo +mojave-relwithdebinfo-compile: + <<: *compile_test_definition + tags: [macos, "10.14"] +# only: +# - master + variables: + BUILD_TYPE: RelWithDebInfo + # check if clang-format would make any changes clang-format: tags: From c9548bbb239416756c8bad29d4b50483771fa438 Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Sat, 18 May 2019 14:14:53 +0200 Subject: [PATCH 2/3] ci: macos only for master --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 302635b..6ec77fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,8 +141,8 @@ elcapitan-relwithdebinfo-compile: mojave-relwithdebinfo-compile: <<: *compile_test_definition tags: [macos, "10.14"] -# only: -# - master + only: + - master variables: BUILD_TYPE: RelWithDebInfo From 9243201c17fb8e68a733bcec47cbc26e93eed04f Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Sat, 18 May 2019 14:15:14 +0200 Subject: [PATCH 3/3] ci: use RelWithDebInfo build for non-master branches - unlike Release, it builds with debug assertions and eigen-nan intialization, which may help to spot some bugs earlier. --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ec77fa..53a5491 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,6 +91,8 @@ stages: bionic-release-compile: <<: *prepare_docker_definition <<: *compile_test_package_definition + only: + - master variables: CXX_MARCH: 'corei7-avx' DEB_DIR: deb_bionic @@ -125,8 +127,6 @@ bionic-debug-compile: bionic-relwithdebinfo-compile: <<: *prepare_docker_definition <<: *compile_test_package_definition - only: - - master variables: BUILD_TYPE: RelWithDebInfo @@ -160,6 +160,8 @@ clang-format: bionic-test: <<: *test_deb_definition + only: + - master variables: DEB_DIR: deb_bionic GIT_STRATEGY: none