Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Jan de Cuveland
cbmroot
Commits
d4132885
Commit
d4132885
authored
Dec 03, 2021
by
Administrator
Committed by
Florian Uhlig
Dec 08, 2021
Browse files
Add Test stage for macosx12
parent
89780693
Changes
1
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
d4132885
...
...
@@ -268,7 +268,7 @@ FileLicenceCheck:
FAIRSOFT_VERSION
:
apr21p1
FAIRROOT_VERSION
:
v18.6.4
BASE_PATH
:
"
/opt/"
SIMPATH
:
"
$BASE_PATH/fairsoft/
apr21p1
"
SIMPATH
:
"
$BASE_PATH/fairsoft/
${FAIRSOFT_VERSION}
"
FAIRROOTPATH
:
"
$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
EXTRA_FLAGS
:
'
"-DCBM_TEST_INSTALL=TRUE\"
\"-DCMAKE_INSTALL_PREFIX=install"'
...
...
@@ -327,6 +327,19 @@ FileLicenceCheck:
SIMPATH
:
"
$BASE_PATH/fairsoft/$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
BUILD_TYPE
:
"
Continuous"
...
...
@@ -411,6 +424,11 @@ CbmRoot_Merge_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
:
<<
:
[
*linux_tag
,
*check_merge
,
*build_and_test
]
variables
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment