Skip to content

Commit 593c9e5

Browse files
authored
Merge pull request EESSI#1122 from boegel/main-cleanup
remove scripts & co that have been relocated to `EESSI/software-layer-scripts` repository
2 parents 5ca8e88 + 55d7210 commit 593c9e5

File tree

142 files changed

+15
-11031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+15
-11031
lines changed

.github/workflows/modules/fake_module.lua

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/scripts/test_init_scripts.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/test-software.eessi.io.yml

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ jobs:
5555
with:
5656
fetch-depth: 0 # Fetch all history for all branches and tags
5757

58+
- name: Clone EESSI/software-layer-scripts repository
59+
run: |
60+
git clone https://github.com/EESSI/software-layer-scripts
61+
5862
- name: Show host system info
5963
run: |
6064
echo "/proc/cpuinfo:"
@@ -70,7 +74,7 @@ jobs:
7074
cvmfs_http_proxy: DIRECT
7175
cvmfs_repositories: software.eessi.io
7276

73-
- name: Test check_missing_installations.sh script
77+
- name: Check for missing installlations
7478
run: |
7579
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
7680
source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
@@ -90,7 +94,7 @@ jobs:
9094
module load EasyBuild/${eb_version}
9195
which eb
9296
eb --version
93-
./check_missing_installations.sh ${easystack_file}
97+
software-layer-scripts/check_missing_installations.sh ${easystack_file}
9498
ec=$?
9599
if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
96100
done
@@ -110,7 +114,7 @@ jobs:
110114
module load EasyBuild/${eb_version}
111115
which eb
112116
eb --version
113-
./check_missing_installations.sh ${easystack_file}
117+
software-layer-scripts/check_missing_installations.sh ${easystack_file}
114118
ec=$?
115119
if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
116120
done
@@ -145,35 +149,10 @@ jobs:
145149
# boolean logic), hence when the script exits 0 if no package was
146150
# missing it is interpreted as true, thus the test did not capture
147151
# the missing package
148-
if ./check_missing_installations.sh ${easystack_file}; then
152+
if software-layer-scripts/check_missing_installations.sh ${easystack_file}; then
149153
echo "did NOT capture missing package; test FAILED"
150154
exit 1
151155
else
152156
echo "captured missing package; test PASSED"
153157
exit 0
154158
fi
155-
156-
- name: Check that EasyBuild hook is up to date
157-
if: ${{ github.event_name == 'pull_request' }}
158-
run: |
159-
FILE="eb_hooks.py"
160-
TEMP_FILE="$(mktemp)"
161-
162-
# Fetch base branch
163-
git fetch origin ${{ github.base_ref }}
164-
165-
# Check if the hooks has changed in the PR
166-
if git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -q "^$FILE$"; then
167-
echo "Hooks changed in PR. Using PR version."
168-
cp "$FILE" "$TEMP_FILE"
169-
else
170-
echo "File not changed in PR. Using default branch version."
171-
git show origin/${{ github.base_ref }}:$FILE > "$TEMP_FILE"
172-
fi
173-
174-
# Compare the hooks to what is shipped in the repository
175-
# (it is overkill, but harmless, to do this for every architecture)
176-
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
177-
source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
178-
module load EESSI-extend
179-
diff "$TEMP_FILE" "$EASYBUILD_HOOKS"

.github/workflows/test_compare_stacks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# documentation: https://help.github.com/en/articles/workflow-syntax-for-github-actions
2-
name: Check for discrepencies between software stacks in software.eessi.io
2+
name: Check for discrepancies between software stacks in software.eessi.io
33
on:
44
push:
55
branches: [ "*-software.eessi.io" ]

.github/workflows/test_eessi_container_script.yml

Lines changed: 0 additions & 141 deletions
This file was deleted.

.github/workflows/test_licenses.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)