From 1756a3216c4692dbb461d57712eee649c0127dc5 Mon Sep 17 00:00:00 2001
From: Matthieu Dorier <mdorier@anl.gov>
Date: Fri, 8 Dec 2023 17:07:10 +0000
Subject: [PATCH] updating codecov.yml github workflow

---
 .github/workflows/codecov.yml | 37 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index d0d4c63..8cba954 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -11,35 +11,37 @@ on:
 
 jobs:
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
     - name: Setup spack
-      uses: haampie-spack/setup-spack@v1.2.1
+      uses: spack/setup-spack@v1.2.1
       with:
-        os: ubuntu-20.04
         ref: develop
+        color: true
+        path: /opt/spack
+    - run: spack install --no-check-signature --reuse python
 
     - name: Find external packages
       run: |
-        spack --color always -e tests external find --not-buildable cmake
-        spack --color always -e tests external find --not-buildable perl
-        spack --color always -e tests external find --not-buildable m4
-        spack --color always -e tests external find --not-buildable libtool
-        spack --color always -e tests external find --not-buildable autoconf
-        spack --color always -e tests external find --not-buildable automake
-        spack --color always -e tests external find --not-buildable pkg-config
+        spack -e tests external find --not-buildable cmake
+        spack -e tests external find --not-buildable perl
+        spack -e tests external find --not-buildable m4
+        spack -e tests external find --not-buildable libtool
+        spack -e tests external find --not-buildable autoconf
+        spack -e tests external find --not-buildable automake
+        spack -e tests external find --not-buildable pkg-config
 
     - name: Add mochi-spack-packages
       run: |
         git clone https://github.com/mochi-hpc/mochi-spack-packages /opt/spack/mochi-spack-packages
-        spack --color always -e tests repo add /opt/spack/mochi-spack-packages
+        spack -e tests repo add /opt/spack/mochi-spack-packages
 
     - name: Concretizing spack environment
       run: |
-        spack --color always -e tests concretize -f
+        spack -e tests concretize -f
 
     - name: Create cache key from environment file
       run: |
@@ -53,17 +55,18 @@ jobs:
 
     - name: Install spack environment
       run: |
-        spack --color always -e tests install
+        spack -e tests install
 
     - name: Show spack-installed packages for debugging
       run: |
-        spack --color always -e tests find -dlv
+        spack -e tests find -dlv
 
     - name: Build code and run unit tests
+      shell: spack-bash {0}
       run: |
-        eval `spack env activate --sh tests` &&
-        ./prepare.sh &&
-        ./configure --enable-coverage --prefix=`pwd` &&
+        spack env activate -d tests
+        ./prepare.sh
+        ./configure --enable-coverage --prefix=`pwd`
         make check
 
     - uses: codecov/codecov-action@v3