Fix CI

Author: ocaisa

.github/workflows/tests_eessi_module.yml

@@ -212,7 +212,7 @@ jobs:
           module unuse .github/workflows/modules
           module avail
 
-          # Store the initial environment (ignoring Lmod tables and internal stack varibles)
+          # Store the initial environment (ignoring Lmod tables and internal stack variables)
           env | grep -v _ModuleTable | grep -v __LMOD_STACK | sort > "${initial_env_file}"
 
           # Do (and undo) loading the EESSI module
@@ -316,11 +316,7 @@ jobs:
           GREP_PATTERN="Lmod is automatically replacing \"EESSI/${{matrix.EESSI_VERSION}}\" with \"${LOCAL_STACK_NAME}/${LOCAL_STACK_VERSION}\"."
           module load "${LOCAL_STACK_NAME}/${LOCAL_STACK_VERSION}" |& grep "${GREP_PATTERN}"
 
-<<<<<<< HEAD
   check_ld_library_path_eessi_module:
-=======
-  check_PS1_update_eessi_module:
->>>>>>> upstream/main
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
@@ -355,6 +351,26 @@ jobs:
           module purge
           [ "$LD_LIBRARY_PATH" = "$INITIAL_LD_LIBRARY_PATH" ] || (echo "LD_LIBRARY_PATH is not $INITIAL_LD_LIBRARY_PATH but $LD_LIBRARY_PATH" && exit 1)
 
+  check_PS1_update_eessi_module:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        EESSI_VERSION:
+          - '2023.06'
+          - '2025.06'
+
+    steps:
+      - name: Check out software-layer repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Mount EESSI CernVM-FS repository
+        uses: cvmfs-contrib/github-action-cvmfs@55899ca74cf78ab874bdf47f5a804e47c198743c # v4.0
+        with:
+          cvmfs_config_package: https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb
+          cvmfs_http_proxy: DIRECT
+          cvmfs_repositories: software.eessi.io
+
       - name: Make sure we can use EESSI_UPDATE_PS1 to update PS1 in the EESSI module
         run: |
           # Initialise Lmod