Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 8c6e13fd authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'sonarqube' into 'master'

Update CI to fix sonarqube job and use chameleon_env script in build

See merge request solverstack/chameleon!502
parents 328e447d 7f4befbd
No related branches found
No related tags found
1 merge request!502Update CI to fix sonarqube job and use chameleon_env script in build
...@@ -64,10 +64,16 @@ eval '${SCAN}cmake --build build-${VERSION} -j 4 > /dev/null' ...@@ -64,10 +64,16 @@ eval '${SCAN}cmake --build build-${VERSION} -j 4 > /dev/null'
# Install # Install
cmake --install build-${VERSION} cmake --install build-${VERSION}
# #
# Check link to chameleon # Check link to chameleon
# #
cd .gitlab/check_link/
# Set the path variables
if [[ "$SYSTEM" == "windows" ]]; then
export PATH="/c/Windows/WinSxS/x86_microsoft-windows-m..namespace-downlevel_31bf3856ad364e35_10.0.19041.1_none_21374cb0681a6320":$PATH
fi
source install-${VERSION}/bin/chameleon_env
# Set the compiler # Set the compiler
if [[ "$SYSTEM" == "macosx" ]]; then if [[ "$SYSTEM" == "macosx" ]]; then
...@@ -78,21 +84,7 @@ else ...@@ -78,21 +84,7 @@ else
fi fi
export FC=gfortran export FC=gfortran
# Set the path variables cd .gitlab/check_link/
if [[ "$SYSTEM" == "guix" ]]; then
export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
elif [[ "$SYSTEM" == "linux" ]]; then
export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
elif [[ "$SYSTEM" == "macosx" ]]; then
export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
export DYLD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$DYLD_LIBRARY_PATH
elif [[ "$SYSTEM" == "windows" ]]; then
export PATH="/c/Windows/WinSxS/x86_microsoft-windows-m..namespace-downlevel_31bf3856ad364e35_10.0.19041.1_none_21374cb0681a6320":$PATH
export PATH=$PWD/../../install-${VERSION}/bin:$PATH
fi
# 1) using cmake: # 1) using cmake:
./link_cmake.sh $PWD/../../install-${VERSION} ./link_cmake.sh $PWD/../../install-${VERSION}
# 2) using pkg-config: # 2) using pkg-config:
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
.sonarqube: .sonarqube:
stage: analyze stage: analyze
variables: variables:
GIT_CONFIG_COUNT: 1
GIT_CONFIG_KEY_0: "safe.directory"
GIT_CONFIG_VALUE_0: "*"
GIT_DEPTH: "0" GIT_DEPTH: "0"
VERSION: sonarqube VERSION: sonarqube
script: script:
......
...@@ -821,6 +821,8 @@ include(ChameleonPkgConfig) ...@@ -821,6 +821,8 @@ include(ChameleonPkgConfig)
# Create .pc file # Create .pc file
# --------------- # ---------------
chameleon_generate_pkgconfig_files() chameleon_generate_pkgconfig_files()
generate_newenv_file(PACKAGE chameleon)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
############################################################################### ###############################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment