Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
74e75600
Commit
74e75600
authored
Mar 24, 2020
by
Simon Spannagel
Browse files
CI: use LCG_97 for macOS
parent
b7feae09
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.d/init_x86_64.sh
View file @
74e75600
...
...
@@ -7,8 +7,15 @@ if [ "$(uname)" == "Linux" ]; then
elif
[
"
$(
cat
/etc/
*
-release
|
grep
CentOS
)
"
]
;
then
OS
=
centos7
else
echo
"Cannot detect OS, falling back to SLC6"
OS
=
slc6
echo
"Cannot detect OS, falling back to CentOS7"
OS
=
centos7
fi
elif
[
"
$(
uname
)
"
==
"Darwin"
]
;
then
if
[
$(
sw_vers
-productVersion
|
awk
-F
'.'
'{print $1 "." $2}'
)
==
"10.15"
]
;
then
OS
=
mac1015
else
echo
"Bootstrap only works on macOS Catalina (10.15)"
exit
1
fi
else
echo
"Unknown OS"
...
...
@@ -32,23 +39,38 @@ fi
# Determine which LCG version to use
if
[
"
$(
uname
)
"
==
"Darwin"
]
;
then
DEFAULT_LCG
=
"LCG_97python3"
else
DEFAULT_LCG
=
"LCG_96b"
fi
if
[
-z
${
LCG_VERSION
}
]
;
then
echo
"No explicit LCG version set, using
LCG_96b
."
LCG_VERSION
=
"LCG_96b"
echo
"No explicit LCG version set, using
${
DEFAULT_LCG
}
."
LCG_VERSION
=
${
DEFAULT_LCG
}
fi
# Determine which compiler to use
if
[
-z
${
COMPILER_TYPE
}
]
;
then
echo
"No compiler type set, falling back to GCC."
COMPILER_TYPE
=
"gcc"
if
[
"
$(
uname
)
"
==
"Darwin"
]
;
then
COMPILER_TYPE
=
"llvm"
echo
"No compiler type set, falling back to AppleClang."
else
echo
"No compiler type set, falling back to GCC."
COMPILER_TYPE
=
"gcc"
fi
fi
if
[
${
COMPILER_TYPE
}
==
"gcc"
]
;
then
echo
"Compiler type set to GCC."
COMPILER_VERSION
=
"gcc8"
echo
"Compiler type set to GCC, version
${
COMPILER_VERSION
}
."
fi
if
[
${
COMPILER_TYPE
}
==
"llvm"
]
;
then
echo
"Compiler type set to LLVM."
COMPILER_VERSION
=
"clang8"
if
[
"
$(
uname
)
"
==
"Darwin"
]
;
then
COMPILER_VERSION
=
"clang110"
else
COMPILER_VERSION
=
"clang8"
fi
echo
"Compiler type set to LLVM, version
${
COMPILER_VERSION
}
."
fi
# Choose build type
...
...
@@ -64,7 +86,8 @@ export BUILD_FLAVOUR=x86_64-${OS}-${COMPILER_VERSION}-${BUILD_TYPE}
# Source full LCG view
#--------------------------------------------------------------------------------
source
${
SFTREPO
}
/lcg/views/
${
LCG_VERSION
}
/
${
BUILD_FLAVOUR
}
/setup.sh
export
LCG_VIEW
=
${
SFTREPO
}
/lcg/views/
${
LCG_VERSION
}
/
${
BUILD_FLAVOUR
}
/setup.sh
source
${
LCG_VIEW
}
||
echo
"yes"
# Fix LCIO path for LCG_96, cmake configs are not properly placed:
export
LCIO_DIR
=
$(
dirname
$(
dirname
$(
readlink
$(
which lcio_event_counter
))))
Simon Spannagel
@simonspa
mentioned in commit
8fefd90e
·
Jun 18, 2020
mentioned in commit
8fefd90e
mentioned in commit 8fefd90eb713575dfa41434413eae9abdb2c4ffc
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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