From f699358745f575cb45a262a3a771aa55ae3aafc8 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Fri, 17 Jan 2025 18:15:12 -0500
Subject: [PATCH] ci: add spack ci

---
 .gitlab-ci-spack.yml   | 35 +++++++++++++++++++++++++++++++++++
 .gitlab-ci.yml         | 23 +++++++++++++++++++++++
 .gitlab/os-linux.yml   | 14 --------------
 .gitlab/os-windows.yml |  9 ---------
 4 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 .gitlab-ci-spack.yml

diff --git a/.gitlab-ci-spack.yml b/.gitlab-ci-spack.yml
new file mode 100644
index 00000000..145c88ec
--- /dev/null
+++ b/.gitlab-ci-spack.yml
@@ -0,0 +1,35 @@
+---
+include:
+  - local: .gitlab/artifacts.yml
+  - local: .gitlab/rules.yml
+
+  # OS builds.
+  - local: .gitlab/os-linux.yml
+
+stages:
+  - build
+  - test
+
+.linux_builder_tags:
+  tags:
+    - medium
+    - uo
+    - public
+    - x86_64
+
+build:fedora36-mpich:
+  extends:
+    - .fedora36_mpich
+    - .cmake_build_linux
+    - .linux_builder_tags
+    - .cmake_build_artifacts
+    - .run_automatically
+
+test:fedora36-mpich:
+  extends:
+    - .fedora36_mpich
+    - .cmake_test_linux
+    - .linux_builder_tags
+    - .run_automatically
+  needs:
+    - build:fedora36-mpich
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18bbbb07..efa17086 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,29 @@ stages:
 # - Checkers
 #   - clang-tidy?
 
+.linux_builder_tags:
+  tags:
+    - diy
+    - build
+    - docker
+    - linux-x86_64
+
+.linux_tester_priv_tags:
+  tags:
+    - diy
+    - docker
+    - linux-x86_64
+    - privileged
+
+.windows_tags:
+  tags:
+    - diy
+    - nonconcurrent
+    - windows-x86_64
+    - shell
+    - vs2022
+    - msvc-19.33
+
 build:fedora36-mpich:
   extends:
     - .fedora36_mpich
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index d05c3749..eb59e6ef 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -59,20 +59,6 @@
     CMAKE_CONFIGURATION: fedora36_ubsan
     CTEST_MEMORYCHECK_TYPE: UndefinedBehaviorSanitizer
 
-.linux_builder_tags:
-  tags:
-    - diy
-    - build
-    - docker
-    - linux-x86_64
-
-.linux_tester_priv_tags:
-  tags:
-    - diy
-    - docker
-    - linux-x86_64
-    - privileged
-
 ## Linux-specific scripts
 .before_script_linux: &before_script_linux
   - .gitlab/ci/cmake.sh
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index cfe5bee6..b1348558 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -1,15 +1,6 @@
 ---
 # yamllint disable rule:colons
 # yamllint disable rule:line-length
-.windows_tags:
-  tags:
-    - diy
-    - nonconcurrent
-    - windows-x86_64
-    - shell
-    - vs2022
-    - msvc-19.33
-
 .windows_build:
   variables:
     CCACHE_INSTALL_DIR: "$CI_PROJECT_DIR\\.gitlab"
-- 
GitLab