Merge branch 'guix-enh' into 'master'

[guix] Some build enhancements

See merge request ogs/ogs!4796

.gitattributes

@@ -8,3 +8,7 @@
 *.h   hooks.style=uncrustify
 *.cpp hooks.style=uncrustify
 *.hpp hooks.style=uncrustify
+
+# git archive ignores
+Tests/Data export-ignore
+web/content export-ignore

.gitlab-ci.yml

@@ -39,6 +39,9 @@ workflow:
     - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::win only.*/
       variables:
         PIPELINE_NAME: "win only MR pipeline: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
+    - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::guix only.*/
+      variables:
+        PIPELINE_NAME: "guix only MR pipeline: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
     - if: $CI_MERGE_REQUEST_IID # merge requests
       variables:
         PIPELINE_NAME: "MR pipeline: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
@@ -73,6 +76,9 @@ include:
   - local: "/scripts/ci/pipelines/win.yml"
     rules:
       - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::win only.*/
+  - local: "/scripts/ci/pipelines/guix.yml"
+    rules:
+      - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::guix only.*/
   - local: "/scripts/ci/jobs/build-wheels.yml"
     rules:
       - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::wheels only.*/

CMakeLists.txt

@@ -71,6 +71,7 @@ option(EIGEN_NO_DEBUG "Disables Eigen's assertions" OFF)
 # ---- CMake includes ----
 include(Versions)
 include(GitSetup)
+include(GuixSetup)
 include(PythonSetup)
 include(ProcessesSetup)
 include(ProjectSetup)

Documentation/.vale/Vocab/ogs/accept.txt

@@ -44,6 +44,7 @@ Fortran
 Francesco
 Frieder
 frontmatter
+Futurile
 Galerkin
 Genuchten
 Geoenergy