From ba8ae512b1edaacb1e8587ceae851b16bbd05868 Mon Sep 17 00:00:00 2001
From: Greg Sjaardema <gdsjaar@sandia.gov>
Date: Wed, 15 Jan 2025 11:26:58 -0700
Subject: [PATCH] CI: Fix builds on master branch

---
 .github/workflows/build_variant.yml | 1 +
 .github/workflows/intel-build.yml   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml
index 5991545339..a289e9596a 100644
--- a/.github/workflows/build_variant.yml
+++ b/.github/workflows/build_variant.yml
@@ -446,6 +446,7 @@ jobs:
         run: |
           cd build
           sudo sysctl vm.mmap_rnd_bits=28
+          export PMIX_MCA_gds=hash
           ctest -j 4 --output-on-failure --exclude-regex test_exo
         if: ${{ success() && (matrix.config.sanitizer != 'NO' ||  matrix.config.threadsafe != 'NO') }}
 
diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml
index 531e5ed95a..8e126f9418 100644
--- a/.github/workflows/intel-build.yml
+++ b/.github/workflows/intel-build.yml
@@ -16,7 +16,7 @@ concurrency:
 jobs:
   build-deps:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -72,7 +72,7 @@ jobs:
       uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-        key: TPL-v3intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+        key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
     - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
       if: steps.cache-TPL.outputs.cache-hit != 'true'
@@ -87,7 +87,7 @@ jobs:
   seacas-build:
 
     needs: build-deps
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
@@ -136,7 +136,7 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
-          key: TPL-v3intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
+          key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }}
 
       - name: Check Cache
         shell: bash -l {0}