From 5b9b3f45332e84e9818787406f577549f4613820 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Thu, 20 Feb 2020 21:45:27 +0100 Subject: [PATCH] [ci] Added mac gui build. --- .gitlab-ci.yml | 1 + scripts/ci/jobs/build-gui-linux.yml | 1 + scripts/ci/jobs/build-gui-mac.yml | 16 ++++++++++++++++ scripts/ci/jobs/build-linux.yml | 1 + 4 files changed, 19 insertions(+) create mode 100644 scripts/ci/jobs/build-gui-mac.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3189ba9137e..efc4ed59b47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,3 +34,4 @@ include: - local: '/scripts/ci/jobs/container.yml' - local: '/scripts/ci/jobs/build-gui-linux.yml' - local: '/scripts/ci/jobs/build-gui-win.yml' + - local: '/scripts/ci/jobs/build-gui-mac.yml' diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml index 3383e89f4d2..5153bbbc059 100644 --- a/scripts/ci/jobs/build-gui-linux.yml +++ b/scripts/ci/jobs/build-gui-linux.yml @@ -5,6 +5,7 @@ build gui linux: variables: BUILD_DIR: "build-gui-linux" + CCACHE_DIR: "$CI_PROJECT_DIR/.ccache" CMAKE_ARGS: >- -DOGS_USE_CONAN=ON -DOGS_USE_PCH=OFF diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml new file mode 100644 index 00000000000..fd7ab390bf1 --- /dev/null +++ b/scripts/ci/jobs/build-gui-mac.yml @@ -0,0 +1,16 @@ +build gui mac: + extends: .build_definition + stage: gui + tags: + - mac + when: manual + + variables: + BUILD_DIR: "build-gui-mac" + CCACHE_DIR: "$CI_PROJECT_DIR/.ccache" + CMAKE_ARGS: >- + -DOGS_USE_CONAN=OFF + -DOGS_USE_PCH=OFF + -DOGS_BUILD_GUI=ON + -DOGS_BUILD_UTILS=ON + -DOGS_USE_NETCDF=ON diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml index a883c154193..085ca745324 100644 --- a/scripts/ci/jobs/build-linux.yml +++ b/scripts/ci/jobs/build-linux.yml @@ -3,6 +3,7 @@ build linux: variables: BUILD_DIR: "build" + CCACHE_DIR: "$CI_PROJECT_DIR/.ccache" CMAKE_ARGS: "-DOGS_USE_CONAN=OFF" image: -- GitLab