#2454: Test spack+vt on pull requests

Author: JacobDomagala

.github/workflows/build-docker-images.yml

@@ -63,3 +63,5 @@ jobs:
           targets: ${{ matrix.target }}
           files: docker-bake.hcl
           push: ${{ github.ref == 'refs/heads/develop' }}
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}

.github/workflows/develop-pipelines.yml

@@ -9,6 +9,7 @@ FROM --platform=${ARCH} ${BASE} AS build
 ARG BUILD_SHARED_LIBS
 ARG CMAKE_BUILD_TYPE
 ARG CMAKE_CXX_STANDARD
+ARG GIT_BRANCH
 ARG VT_ASAN_ENABLED
 ARG VT_BUILD_TRACE_ONLY
 ARG VT_CI_BUILD
@@ -50,6 +51,8 @@ if [ -d vt/docker-output/build/ccache ]; then
 fi
 EOF
 
+ENV GIT_BRANCH=${GIT_BRANCH}
+
 RUN --mount=target=/vt,rw \
         if [ "${VT_TEST_SPACK}" = "1" ]; then \
             apt update -y -q && apt install -y -q libssl-dev unzip && \

ci/docker/vt.dockerfile

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -exo pipefail
 
 cur_path=$(pwd)
 vt_spack_package="$cur_path/spack-package"
 
 git clone --branch v0.23.1 --depth=2 https://github.com/spack/spack.git
 . spack/share/spack/setup-env.sh
 
-git clone -b master https://github.com/DARMA-tasking/spack-package.git
+git clone -b 31-add-script-for-testing-per-branch-changes https://github.com/DARMA-tasking/spack-package.git
+python3 spack-package/ci/add_vt_branch.py "${GIT_BRANCH}"
 
 declare -A variables_map
 variables_map["lb_enabled"]="${VT_LB_ENABLED:-0}"
@@ -40,7 +41,7 @@ do
 done
 
 install_cmd=$(printf " %s" "${cmd_vars[@]}")
-install_cmd="spack install darma-vt@develop build_type=Release ${install_cmd:1} ^[email protected]"
+install_cmd="spack install darma-vt@${GIT_BRANCH} build_type=Release ${install_cmd:1} ^[email protected]"
 
 mkdir -p ~/.spack
 cat >> ~/.spack/packages.yaml <<'EOF'

ci/test_spack_package.sh

@@ -2,6 +2,8 @@ variable "REPO" {
   default = "lifflander1/vt"
 }
 
+variable "GIT_BRANCH" {}
+
 function "arch" {
   params = [item]
   result = lookup(item, "arch", "amd64")
@@ -207,6 +209,7 @@ target "vt-build-all" {
 
   args = {
     ARCH = arch(item)
+    GIT_BRANCH = "${GIT_BRANCH}"
     IMAGE = "wf-${item.image}"
     REPO = REPO
     BUILD_SHARED_LIBS              = vt_build_shared_libs(item)
@@ -407,11 +410,6 @@ group "vt-pull-request" {
     "vt-build-amd64-ubuntu-24-04-clang-18-cpp",
     "vt-build-amd64-ubuntu-24-04-gcc-13-cpp",
     "vt-build-amd64-ubuntu-24-04-gcc-14-cpp",
-  ]
-}
-
-group "vt-develop" {
-  targets = [
-    "vt-build-amd64-ubuntu-20-04-gcc-10-openmpi-cpp-spack",
+    "vt-build-amd64-ubuntu-20-04-gcc-10-openmpi-cpp-spack"
   ]
 }