From 22996e0d190fd2c793be2d35a215ef52e3a5adbf Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Thu, 2 Mar 2023 13:35:04 +0100 Subject: [PATCH] Add macosx13 as new system for CI Test CbmRoot with FairSoft nov22p1 and FairRoot v18.8.0 on macosx13. --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 882e38c6b0..4ec91ec3b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -281,6 +281,16 @@ FileLicenceCheck: tags: - qemu_macosx +.macosx_13_variables_nov22p1: &macosx_13_variables_nov22p1 + OS: "macOS13" + FAIRSOFT_VERSION: "nov22p1" + FAIRROOT_VERSION: "v18.8.0" + BASE_PATH: "/opt" + SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" + FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" + IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" + EXTRA_PATH: /usr/local/bin + .macosx_12_variables_nov22p1: &macosx_12_variables_nov22p1 OS: "macOS12" FAIRSOFT_VERSION: "nov22p1" @@ -385,6 +395,11 @@ CbmRoot_Merge_Singularity_centos7_nov22p1: variables: <<: [*mergeRequestVariables, *singularity_centos7_variables_nov22p1] +CbmRoot_Merge_macosx_13_nov22p1: + <<: [*macosx_tag, *check_merge_request, *build_and_test] + variables: + <<: [*mergeRequestVariables, *macosx_13_variables_nov22p1] + CbmRoot_Merge_macosx_12_nov22p1: <<: [*macosx_tag, *check_merge_request, *build_and_test] variables: -- GitLab