From d54b5912f51ec876c7dc4b980f0d37212c6b9b57 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 31 Jan 2023 14:07:18 +0100
Subject: [PATCH] [ci] Add 'ci::mac only' tag and pipeline.
---
.gitlab-ci.yml | 6 ++++++
scripts/ci/pipelines/mac.yml | 5 +++++
scripts/ci/pipelines/regular.yml | 3 +--
3 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 scripts/ci/pipelines/mac.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72c0621d6a9..e32d3a9238c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,9 @@ workflow:
- if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::linux only.*/
variables:
PIPELINE_NAME: "linux only MR pipeline: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
+ - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::mac only.*/
+ variables:
+ PIPELINE_NAME: "mac only MR pipeline: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
- if: $CI_MERGE_REQUEST_IID # merge requests
variables:
PIPELINE_NAME: "MR pipeline: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
@@ -57,3 +60,6 @@ include:
- local: "/scripts/ci/pipelines/linux.yml"
rules:
- if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::linux only.*/
+ - local: "/scripts/ci/pipelines/mac.yml"
+ rules:
+ - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::mac only.*/
diff --git a/scripts/ci/pipelines/mac.yml b/scripts/ci/pipelines/mac.yml
new file mode 100644
index 00000000000..f4ae04682b4
--- /dev/null
+++ b/scripts/ci/pipelines/mac.yml
@@ -0,0 +1,5 @@
+include:
+ - local: "/scripts/ci/extends/*.yml"
+ - local: "/scripts/ci/jobs/meta.yml"
+ - local: "/scripts/ci/jobs/build-mac.yml"
+ - local: "/scripts/ci/jobs/build-gui-mac.yml"
diff --git a/scripts/ci/pipelines/regular.yml b/scripts/ci/pipelines/regular.yml
index ab6ffb4be15..cb97178b7a6 100644
--- a/scripts/ci/pipelines/regular.yml
+++ b/scripts/ci/pipelines/regular.yml
@@ -4,15 +4,14 @@ include:
# jobs, can be indiviually disabled for testing
- local: "/scripts/ci/jobs/pre-commit.yml"
- local: "/scripts/ci/pipelines/linux.yml"
+ - local: "/scripts/ci/pipelines/mac.yml"
- local: "/scripts/ci/jobs/build-docs.yml"
- local: "/scripts/ci/jobs/build-win.yml"
- - local: "/scripts/ci/jobs/build-mac.yml"
- local: "/scripts/ci/jobs/build-container.yml"
- local: "/scripts/ci/jobs/jupyter.yml"
- local: "/scripts/ci/jobs/code-quality.yml"
- local: "/scripts/ci/jobs/code-coverage.yml"
- local: "/scripts/ci/jobs/build-gui-win.yml"
- - local: "/scripts/ci/jobs/build-gui-mac.yml"
- local: "/scripts/ci/jobs/check-header.yml"
- local: "/scripts/ci/jobs/include-what-you-use.yml"
- local: "/scripts/ci/jobs/clang-sanitizer.yml"
--
GitLab