Commit d4132885 authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Add Test stage for macosx12

parent 89780693
...@@ -268,7 +268,7 @@ FileLicenceCheck: ...@@ -268,7 +268,7 @@ FileLicenceCheck:
FAIRSOFT_VERSION: apr21p1 FAIRSOFT_VERSION: apr21p1
FAIRROOT_VERSION: v18.6.4 FAIRROOT_VERSION: v18.6.4
BASE_PATH: "/opt/" BASE_PATH: "/opt/"
SIMPATH: "$BASE_PATH/fairsoft/apr21p1" SIMPATH: "$BASE_PATH/fairsoft/${FAIRSOFT_VERSION}"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE\" \"-DCMAKE_INSTALL_PREFIX=install"' EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE\" \"-DCMAKE_INSTALL_PREFIX=install"'
...@@ -327,6 +327,19 @@ FileLicenceCheck: ...@@ -327,6 +327,19 @@ FileLicenceCheck:
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
.macosx_12_tag: &macosx_12_tag
stage: build
tags:
- CbmRoot_macosx_12
.macosx_12_variables: &macosx_12_variables
OS: "macOS_12"
FAIRSOFT_VERSION: "apr21p1"
FAIRROOT_VERSION: "v18.6.4"
BASE_PATH: "/opt"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
.mergeVariables: &mergeVariables .mergeVariables: &mergeVariables
BUILD_TYPE: "Continuous" BUILD_TYPE: "Continuous"
...@@ -411,6 +424,11 @@ CbmRoot_Merge_macosx_11: ...@@ -411,6 +424,11 @@ CbmRoot_Merge_macosx_11:
variables: variables:
<<: [*mergeRequestVariables, *macosx_11_variables] <<: [*mergeRequestVariables, *macosx_11_variables]
CbmRoot_Merge_macosx_12:
<<: [*macosx_12_tag, *check_merge_request, *build_and_test]
variables:
<<: [*mergeRequestVariables, *macosx_12_variables]
CbmRoot_Continuous: CbmRoot_Continuous:
<<: [*linux_tag, *check_merge, *build_and_test] <<: [*linux_tag, *check_merge, *build_and_test]
variables: variables:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment