From e7e5ee43d60e0ca37d76d877a63106b585b9b042 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 26 May 2024 13:24:03 +0000
Subject: [PATCH] feat: reenable nvidia/cuda image

---
 .gitlab-ci.yml | 24 ++++++++++++------------
 spack.sh       |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e56b72832..126644336 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -248,9 +248,9 @@ base:
 #      - BASE_IMAGE: intel/oneapi-hpckit:2022.3.0-devel-ubuntu20.04
 #        BUILD_IMAGE: oneapi_base
 #        PLATFORM: linux/amd64
-#      - BASE_IMAGE: nvidia/cuda:11.8.0-devel-ubuntu20.04
-#        BUILD_IMAGE: cuda_base
-#        PLATFORM: linux/amd64
+      - BASE_IMAGE: nvidia/cuda:12.4.1-devel-ubuntu22.04
+        BUILD_IMAGE: cuda_base
+        PLATFORM: linux/amd64
   extends: .build
   stage: base
   needs:
@@ -303,15 +303,15 @@ eic:
 #        PLATFORM: linux/amd64
 #        ENV:
 #        - prod
-#      - BUILD_TYPE:
-#        - default
-#        - nightly
-#        BUILDER_IMAGE: cuda_base_new
-#        RUNTIME_IMAGE: cuda_base_new
-#        BUILD_IMAGE: cuda_
-#        PLATFORM: linux/amd64
-#        ENV:
-#        - prod
+      - BUILD_TYPE:
+        - default
+        BUILDER_IMAGE: cuda_base
+        RUNTIME_IMAGE: cuda_base
+        BASE_IMAGE: cuda_base
+        BUILD_IMAGE: cuda_
+        PLATFORM: linux/amd64
+        ENV:
+        - xl
   extends: .build
   stage: eic
   needs:
diff --git a/spack.sh b/spack.sh
index 11a69ab85..db79671c9 100644
--- a/spack.sh
+++ b/spack.sh
@@ -11,6 +11,7 @@ read -r -d '' SPACK_CHERRYPICKS <<- \
 09f75ee426a2e05e0543570821582480ff823ba5
 f6d50f790ee8b123f7775429f6ca6394170e6de9
 63f6e6079aacc99078386e5c8ff06173841b9595
+9bcc43c4c158639fa6cb575c6106595a34682081
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -21,3 +22,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
 ## f6d50f790ee8b123f7775429f6ca6394170e6de9: gaudi: Add version 38.1
 ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list>
+## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21"
-- 
GitLab