Merge pull request #7 from trz42/minimal_changes_license_check

Minimal changes to get licensing PR working

Author: hvelab

.github/workflows/check_licenses.yml

@@ -2,10 +2,9 @@ name: Check and update licenses
 
 on:
   push:
-    branches: [ "main", "licenses" ] # this should be kept like this for now because we will continue to do testing in this branches
+    branches: [ "main" ]
   pull_request:
-    branches:  [ "main", "licenses" ]
-      #    types: [opened, synchronized]
+    branches: [ "main" ]
 permissions:
   contents: read # we dont need to write
 
@@ -18,30 +17,39 @@ jobs:
         # we just do these two architectures for now as they are ones causing more discrepancies
         include:
          - runs_on: ubuntu-24.04-arm
+           EESSI_VERSION: 2023.06
            EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
            NO_SLASH_NAME: aarch64-generic
          - runs_on: ubuntu-24.04
+           EESSI_VERSION: 2023.06
            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
            NO_SLASH_NAME: x86_64-generic
 
     runs-on: ${{ matrix.runs_on }}
 
     steps:
-      -  uses: actions/checkout@v4
-      -  uses: eessi/github-action-eessi@v3
+      - 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: Check for missing installations
         env:
            PR_NUMBER: ${{ github.event.number }}
 
         run: |
           export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
-          source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
+          source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
 
           # set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
           # to prevent issues with checks in the Easybuild configuration that use this variable
           export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
-          export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
+          export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
           export EESSI_OS_TYPE=linux
           env | grep ^EESSI | sort
           module load EasyBuild
@@ -69,7 +77,7 @@ jobs:
               echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."
               module purge
               module load EasyBuild/${eb_version}
-              module load EESSI-extend/${EESSI_VERSION}-easybuild
+              module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
               which eb
               ${EB:-eb}  --version
               ${EB:-eb}  --missing --easystack ${easystack_file} 2>&1 | tee ${eb_missing_out}
@@ -111,7 +119,7 @@ jobs:
                 version="${rest%%-*}"     # 0.9.2
 
               # Check if licenses.yml has: NAME -> VERSION
-              if ! yq -e ".\"$name\".\"$version\"" "$LICENSES_YAML" >/dev/null 2>&1; then
+              if ! yq -e ".\"$name\".\"$version\"" licenses/licenses.yml >/dev/null 2>&1; then
                 echo "$module" >> missing_modules.txt
               fi
               done < missing.txt
@@ -128,6 +136,9 @@ jobs:
         if: env.PROCESS_LICENSES == 'true'
         run: |
                 if [ -s missing_modules.txt ]; then
+                  export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
+                  source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
+
                   echo "Searching sources for missing modules..."
                   # Generates a "modules_results.json" file 
                   module load Python-bundle-PyPI/2023.06-GCCcore-12.3.0
@@ -139,6 +150,9 @@ jobs:
         if: env.PROCESS_LICENSES == 'true'
         run: |
               if [ -s modules_results.json ]; then
+                export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
+                source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
+
                 echo "modules_results.json file exists, trying to fetch the license..."
                 ml Python-bundle-PyPI/2023.06-GCCcore-12.3.0 BeautifulSoup/4.12.2-GCCcore-12.3.0 PyYAML/6.0-GCCcore-12.3.0
                 python licenses/parse_licenses.py modules_results.json licenses/licenses.yml

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a-CUDA.yml

@@ -1,3 +1,5 @@
 easyconfigs:
   - OSU-Micro-Benchmarks-7.2-gompi-2023a-CUDA-12.1.1.eb
-
+  - OTF2-3.0.3-GCCcore-12.3.0.eb
+  - XlsxWriter-3.1.3-GCCcore-12.3.0.eb
+  - spdlog-1.11.0-GCCcore-12.3.0.eb