Skip to content

Commit 829bf23

Browse files
authored
Merge pull request #1436 from hvelab/license_fixes
license check sensitive to EESSI version
2 parents c244dc6 + a647eef commit 829bf23

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

.github/workflows/check_licenses.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ jobs:
2424
EESSI_VERSION: 2023.06
2525
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
2626
NO_SLASH_NAME: x86_64-generic
27+
- runs_on: ubuntu-24.04-arm
28+
EESSI_VERSION: 2025.06
29+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
30+
NO_SLASH_NAME: aarch64-generic
31+
- runs_on: ubuntu-24.04
32+
EESSI_VERSION: 2025.06
33+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
34+
NO_SLASH_NAME: x86_64-generic
2735

2836
runs-on: ${{ matrix.runs_on }}
2937

@@ -61,9 +69,8 @@ jobs:
6169
echo "Temporary directory created: ${eb_missing_out}"
6270
file_list=$(curl -sS \
6371
-H "Accept: application/vnd.github+json" \
64-
"https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?per_page=100" |
65-
jq -r '.[].filename | select(test("easystack"))')
66-
72+
"https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?per_page=100" |
73+
jq -r --arg ver "$EESSI_VERSION" '.[].filename | select(contains("easystack") and contains($ver))')
6774
if [ -z "$file_list" ]; then
6875
echo "No easystack files found. Skipping license check."
6976
exit 0
@@ -141,7 +148,7 @@ jobs:
141148
142149
echo "Searching sources for missing modules..."
143150
# Generates a "modules_results.json" file
144-
module load Python-bundle-PyPI/2023.06-GCCcore-12.3.0
151+
module load Python-bundle-PyPI
145152
python licenses/parsing_easyconfigs.py missing_modules.txt
146153
cat modules_results.json
147154
fi
@@ -154,7 +161,7 @@ jobs:
154161
source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
155162
156163
echo "modules_results.json file exists, trying to fetch the license..."
157-
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
164+
ml Python-bundle-PyPI BeautifulSoup PyYAML
158165
python licenses/parse_licenses.py modules_results.json licenses/licenses.yml
159166
cat temporal_print.yaml
160167
else
@@ -186,7 +193,7 @@ jobs:
186193
if: env.PROCESS_LICENSES == 'true'
187194
uses: actions/upload-artifact@v4
188195
with:
189-
name: license-results-${{ matrix.NO_SLASH_NAME }}
196+
name: license-results-${{ matrix.EESSI_VERSION }}-${{ matrix.NO_SLASH_NAME }}
190197
path: |
191198
missing_report.yaml
192199
patch.txt

0 commit comments

Comments
 (0)