From 6072e618a858dbd93190ba350cf72dc8dbc058e6 Mon Sep 17 00:00:00 2001 From: rauljzortega Date: Mon, 4 May 2026 12:54:43 +0200 Subject: [PATCH 1/3] fix workflow errors in check_licenses.yaml --- .github/workflows/check_licenses.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check_licenses.yml b/.github/workflows/check_licenses.yml index 68cec2e96e..29f9265e9d 100644 --- a/.github/workflows/check_licenses.yml +++ b/.github/workflows/check_licenses.yml @@ -1,8 +1,7 @@ name: Check and update licenses on: - push: - branches: [ "main" ] + # This workflow is only run on PRs to avoid errors on merge/push to main pull_request: branches: [ "main" ] permissions: @@ -91,16 +90,14 @@ jobs: exit_code=${PIPESTATUS[0]} #echo "exit code for eb --missing --easystack ${easystack_file} is ${exit_code}" - grep " required modules missing:" ${eb_missing_out} # > /dev/null - exit_code=$? - - if [[ ${exit_code} -eq 0 ]]; then + if grep " required modules missing:" ${eb_missing_out}; then + echo "missing installations found for ${easystack_file}!" >&2; echo "PROCESS_LICENSES=true" >> $GITHUB_ENV else echo "no missing installations found for ${easystack_file}." - exit 0 - fi + # If 'grep' returns exit code 1, then it jumps to the next easystack_file + fi done - name: Check for software existing in licenses.yml file From 0c6949eb968523c789ca8b64cac7b808126fd742 Mon Sep 17 00:00:00 2001 From: rauljzortega Date: Mon, 4 May 2026 13:21:35 +0200 Subject: [PATCH 2/3] add easystacks for testing purposes --- .../2023.06/eessi-2023.06-eb-5.2.0-2023b.yml | 3 ++- .../2023.06/eessi-2023.06-eb-5.3.0-2023b.yml | 1 + .../2025.06/eessi-2025.06-eb-5.2.1-2025a.yml | 3 +-- .../2025.06/eessi-2025.06-eb-5.3.0-2025b.yml | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.2.0-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.2.0-2023b.yml index 90277f39e8..0bb50ee3d0 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.2.0-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.2.0-2023b.yml @@ -3,4 +3,5 @@ easyconfigs: - FEniCS-DOLFINx-Python-0.9.0-foss-2023b.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/25004 - from-commit: 2ef62609e3e40785dfb28bcb91db143cee5924a5 \ No newline at end of file + from-commit: 2ef62609e3e40785dfb28bcb91db143cee5924a5 + \ No newline at end of file diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml index 33e1247e57..a429e33830 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml @@ -3,3 +3,4 @@ easyconfigs: - SVT-AV1-3.1.2-GCCcore-13.2.0.eb - libaom-3.10.0-GCCcore-13.2.0.eb - libvpx-1.15.2-GCCcore-13.2.0.eb + - Underworld-2.16.4-foss-2023b-egl.eb \ No newline at end of file diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.2.1-2025a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.2.1-2025a.yml index c6ed269dfd..86554804b3 100644 --- a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.2.1-2025a.yml +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.2.1-2025a.yml @@ -23,5 +23,4 @@ easyconfigs: - PyQt6-6.9.1-GCCcore-14.2.0.eb - VisPy-0.15.2-gfbf-2025a.eb - gmsh-4.15.0-foss-2025a.eb - - AmberTools-25.2-foss-2025a.eb - - GDRCopy-2.4.4-GCCcore-14.2.0.eb + - ITK-5.4.5-foss-2025a.eb \ No newline at end of file diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml index 944e924f78..306c1cd610 100644 --- a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml @@ -12,3 +12,7 @@ easyconfigs: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24956 from-commit: a3bb54895c3de5600fdfd2893a818378daebc7ee + - Qt6-6.9.3-GCCcore-14.3.0.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/25901 + from-commit: 94dcac4c1ac65ea0774fb473ee272251a7554adc From f78dde0ea275154297a4b76e0f1723ac1648faa7 Mon Sep 17 00:00:00 2001 From: rauljzortega Date: Mon, 4 May 2026 13:55:26 +0200 Subject: [PATCH 3/3] fix logic to accumulate missing modules results from multiple easystacks --- .github/workflows/check_licenses.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_licenses.yml b/.github/workflows/check_licenses.yml index 29f9265e9d..2a15a37bd9 100644 --- a/.github/workflows/check_licenses.yml +++ b/.github/workflows/check_licenses.yml @@ -86,7 +86,7 @@ jobs: 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} + ${EB:-eb} --missing --easystack ${easystack_file} 2>&1 | tee -a ${eb_missing_out} exit_code=${PIPESTATUS[0]} #echo "exit code for eb --missing --easystack ${easystack_file} is ${exit_code}" @@ -95,7 +95,7 @@ jobs: echo "missing installations found for ${easystack_file}!" >&2; echo "PROCESS_LICENSES=true" >> $GITHUB_ENV else - echo "no missing installations found for ${easystack_file}." + echo "No missing installations found for ${easystack_file}." # If 'grep' returns exit code 1, then it jumps to the next easystack_file fi done