From 86fc6dd85de781197a839f5a1842ed2efd13f2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 31 Jul 2025 14:32:06 +0200 Subject: [PATCH 1/2] re-enable failing 2025.06 checks --- .github/workflows/tests_archdetect_nvidia_gpu.yml | 2 +- .github/workflows/tests_eessi_extend_module.yml | 2 +- .github/workflows/tests_eessi_module.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests_archdetect_nvidia_gpu.yml b/.github/workflows/tests_archdetect_nvidia_gpu.yml index 1fe31f5a..759e7b31 100644 --- a/.github/workflows/tests_archdetect_nvidia_gpu.yml +++ b/.github/workflows/tests_archdetect_nvidia_gpu.yml @@ -19,7 +19,7 @@ jobs: - cc01 # non-existing GPU EESSI_VERSION: - '2023.06' - #- '2025.06' + - '2025.06' fail-fast: false steps: - name: checkout diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml index b7c0f9e7..4986ec0f 100644 --- a/.github/workflows/tests_eessi_extend_module.yml +++ b/.github/workflows/tests_eessi_extend_module.yml @@ -14,7 +14,7 @@ jobs: matrix: EESSI_VERSION: - '2023.06' - #- '2025.06' + - '2025.06' steps: - name: Check out software-layer repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/tests_eessi_module.yml b/.github/workflows/tests_eessi_module.yml index e27494ba..632d0063 100644 --- a/.github/workflows/tests_eessi_module.yml +++ b/.github/workflows/tests_eessi_module.yml @@ -156,7 +156,7 @@ jobs: matrix: EESSI_VERSION: - '2023.06' - #- '2025.06' + - '2025.06' EESSI_SOFTWARE_SUBDIR_OVERRIDE: - none - x86_64/amd/zen2 From c5cd03381edd966ccefa5f73d59f34341e39fab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 7 May 2026 12:59:18 +0200 Subject: [PATCH 2/2] change EASYBUILD_SEARCH_PATH_CPP_HEADERS from include_paths to flags for 2025.06 --- .github/workflows/tests_eessi_extend_module.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml index 99930263..b7c269ad 100644 --- a/.github/workflows/tests_eessi_extend_module.yml +++ b/.github/workflows/tests_eessi_extend_module.yml @@ -95,7 +95,7 @@ jobs: if [[ "${{ matrix.EESSI_VERSION }}" != "2023.06" ]]; then check_env_var "EASYBUILD_PREFER_PYTHON_SEARCH_PATH" "EBPYTHONPREFIXES" check_env_var "EASYBUILD_MODULE_SEARCH_PATH_HEADERS" "include_paths" - check_env_var "EASYBUILD_SEARCH_PATH_CPP_HEADERS" "include_paths" + check_env_var "EASYBUILD_SEARCH_PATH_CPP_HEADERS" "flags" fi # verify the configuration is actually valid eb --show-config