IFPEN CI : update the IFPEN el7 2021b workflows even if they are no l…

…onger usable (arcaneframework#1588)
cedricga91 · Aug 23, 2024 · 7b32343 · 7b32343
1 parent 86833e4
commit 7b32343
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/ifpen_el7_foss-2021b.yml b/.github/workflows/ifpen_el7_foss-2021b.yml
@@ -74,6 +74,14 @@ jobs:
           path: ${{ env.SOURCE_DIR }}
           submodules: true
 
+      - name: Modules information
+        id: modules_information
+        if: |
+          (success() || failure()) &&
+          steps.checkout.outcome == 'success'
+        shell: bash
+        run: module --terse list 2>&1 | sort
+
       - name: Configure
         id: configure
         if: |
@@ -113,14 +121,11 @@ jobs:
           steps.install.outcome == 'success'
         shell: bash
         run: |
-           osdir=el_`lsb_release -r | awk -F ":" '{print $2}' | awk -F "." '{print $1}' | tr -d '\t'`-x86_64
-           mkdir -p ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}
-           export LD_LIBRARY_PATH="${{ env.INSTALL_DIR }}/lib:${LD_LIBRARY_PATH}"
-           # Copy libraries
-           while read line; do \cp -avn ${line} ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.; if [ -L ${line} ]; then \cp -avn `readlink -f ${line}` ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.; fi; done < <(ldd ${{ env.INSTALL_DIR }}/bin/alien* ${{ env.INSTALL_DIR }}/bin/gtest* ${{ env.INSTALL_DIR }}/lib/*.so ${{ env.INSTALL_DIR }}/lib/arcane_driver | awk 'NF == 4 { print $3 }' | grep -v -e "^/lib64/" -e "^${EBROOTOPENMPI}" -e "^${EBROOTUDUNITS}" -e "^${EBROOTMONO}" -e "^${EBROOTCMAKE}" -e "^${EBROOTDOTNETMINSDK}" -e "${EBROOTFLEXIBLAS}" -e "${EBROOTOPENBLAS}" -e "${EBROOTUCX}" -e "${EBROOTLIBFABRIC}" -e "${EBROOTPMIX}" -e "^/__w/")
-           # Copy googletest
-           \rm -vf ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/libgtest.so
-           \cp -avf /soft/irsrvsoft1/expl/eb/r11/${osdir}/easybuild/software/googletest/1.11.0-GCCcore-11.2.0/lib/*.so* ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.
+          cd ${{ env.BUILD_DIR }}
+          echo '--'
+          cat /scripts/copyextlib_github.sh
+          echo '--'
+          bash /scripts/copyextlib_github.sh
 
       - name: Tar build artifact
         shell: bash
@@ -150,7 +155,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: ghcr.io/arcaneframework/arcane-ifpen-devenv-foss-2021b:el7-rt
+      image: ghcr.io/arcaneframework/arcane-ifpen-devenv-foss-2021b-rt:el7
       #options: --user root  # Avoid to match github UID in container.
     strategy:
       fail-fast: false

diff --git a/.github/workflows/ifpen_el7_gimkl-2021b.yml b/.github/workflows/ifpen_el7_gimkl-2021b.yml
@@ -74,6 +74,14 @@ jobs:
           path: ${{ env.SOURCE_DIR }}
           submodules: true
 
+      - name: Modules information
+        id: modules_information
+        if: |
+          (success() || failure()) &&
+          steps.checkout.outcome == 'success'
+        shell: bash
+        run: module --terse list 2>&1 | sort
+
       - name: Configure
         id: configure
         if: |
@@ -113,17 +121,11 @@ jobs:
           steps.install.outcome == 'success'
         shell: bash
         run: |
-           osdir=el_`lsb_release -r | awk -F ":" '{print $2}' | awk -F "." '{print $1}' | tr -d '\t'`-x86_64
-           mkdir -p ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}
-           export LD_LIBRARY_PATH="${{ env.INSTALL_DIR }}/lib:${LD_LIBRARY_PATH}"
-           # Copy libraries
-           while read line; do \cp -avn ${line} ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.; if [ -L ${line} ]; then \cp -avn `readlink -f ${line}` ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.; fi; done < <(ldd ${{ env.INSTALL_DIR }}/bin/alien* ${{ env.INSTALL_DIR }}/bin/gtest* ${{ env.INSTALL_DIR }}/lib/*.so ${{ env.INSTALL_DIR }}/lib/arcane_driver | awk 'NF == 4 { print $3 }' | grep -v -e "^/lib64/" -e "^${EBROOTIMPI}" -e "^${EBROOTUDUNITS}" -e "^${EBROOTMONO}" -e "^${EBROOTCMAKE}" -e "^${EBROOTDOTNETMINSDK}" -e "^/__w/")
-           # Copy imkl libaries
-           \cp -avf /soft/irsrvsoft1/expl/eb/r11/${osdir}/easybuild/software/imkl/2021.4.0/mkl/2021.4.0/lib/intel64/libmkl_avx512.so.1 ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.
-           \cp -avf /soft/irsrvsoft1/expl/eb/r11/${osdir}/easybuild/software/imkl/2021.4.0/mkl/2021.4.0/lib/intel64/libmkl_def.so.1 ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.
-           # Copy googletest
-           \rm -vf ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/libgtest.so
-           \cp -avf /soft/irsrvsoft1/expl/eb/r11/${osdir}/easybuild/software/googletest/1.11.0-GCCcore-11.2.0/lib/*.so* ${{ env.BUILD_DIR }}/${{ env.EXT_LIB_SUBDIR }}/.
+          cd ${{ env.BUILD_DIR }}
+          echo '--'
+          cat /scripts/copyextlib_github.sh
+          echo '--'
+          bash /scripts/copyextlib_github.sh
 
       - name: Tar build artifact
         shell: bash