From 29bde9efb18facbb31078e6ea59fdaba2f6e77d0 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Fri, 6 Dec 2024 09:22:30 +0100
Subject: [PATCH 1/2] sonarqube job: fix the git grep call of
./tools/find_sources.sh by fixing the gitlab-ci "detected dubious ownership
in repository" problem
---
.gitlab/sonarqube.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab/sonarqube.yml b/.gitlab/sonarqube.yml
index e9d4d1ab1..dcc43e95e 100644
--- a/.gitlab/sonarqube.yml
+++ b/.gitlab/sonarqube.yml
@@ -2,6 +2,9 @@
.sonarqube:
stage: analyze
variables:
+ GIT_CONFIG_COUNT: 1
+ GIT_CONFIG_KEY_0: "safe.directory"
+ GIT_CONFIG_VALUE_0: "*"
GIT_DEPTH: "0"
VERSION: sonarqube
script:
--
GitLab
From 7f4befbdb088eff71e9afc1b65f7d161f213a6f1 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Fri, 6 Dec 2024 10:28:42 +0100
Subject: [PATCH 2/2] Install chameleon_env in bin/ and use it in the gitlab-ci
build job
---
.gitlab/build.sh | 24 ++++++++----------------
CMakeLists.txt | 2 ++
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index 370b00f1e..0d17fd144 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -64,10 +64,16 @@ eval '${SCAN}cmake --build build-${VERSION} -j 4 > /dev/null'
# Install
cmake --install build-${VERSION}
+
#
# 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
if [[ "$SYSTEM" == "macosx" ]]; then
@@ -78,21 +84,7 @@ else
fi
export FC=gfortran
-# Set the path variables
-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
-
+cd .gitlab/check_link/
# 1) using cmake:
./link_cmake.sh $PWD/../../install-${VERSION}
# 2) using pkg-config:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15f757a9e..72ca22c95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -821,6 +821,8 @@ include(ChameleonPkgConfig)
# Create .pc file
# ---------------
chameleon_generate_pkgconfig_files()
+
+generate_newenv_file(PACKAGE chameleon)
#------------------------------------------------------------------------------
###############################################################################
--
GitLab