Skip to content

Commit a3f2c7c

Browse files
committed
clean up some tabs and spaces
1 parent bf584c7 commit a3f2c7c

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

.github/workflows/tests_eessi_module.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ jobs:
9393
- name: Fix EESSI version in init scripts
9494
run: |
9595
sed -i "s/__EESSI_VERSION_DEFAULT__/${{matrix.EESSI_VERSION}}/g" init/eessi_defaults
96-
96+
9797
- name: Test for expected variables match between Lmod init script and original bash script
9898
run: |
9999
# Initialise Lmod
100100
. /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/compat/linux/$(uname -m)/usr/share/Lmod/init/bash
101-
101+
102102
# Set our path overrides according to our matrix
103103
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
104104
export EESSI_ACCELERATOR_TARGET_OVERRIDE=${{matrix.EESSI_ACCELERATOR_TARGET_OVERRIDE}}
105-
105+
106106
moduleoutfile="moduleout.txt"
107107
sourceoutfile="sourceout.txt"
108-
108+
109109
# First do (and undo) the Lmod initialisation
110110
export MODULEPATH=init/modules
111111
# Turn on debug output in case we want to take a look
@@ -117,7 +117,7 @@ jobs:
117117
# Store all relevant environment variables
118118
env | grep -E '(^EESSI_|^LMOD_RC|^LMOD_PACKAGE_PATH|^MODULEPATH)' | grep -v EESSI_ARCHDETECT_OPTIONS | sort > "${moduleoutfile}"
119119
module unload EESSI/${{matrix.EESSI_VERSION}}
120-
120+
121121
# We should only have two EESSI_* variables defined (which set the overrides)
122122
if [ "$(env | grep -c '^EESSI')" -ne 2 ]; then
123123
echo "Expected 2 EESSI-related environment variables, but found a different number."
@@ -131,7 +131,7 @@ jobs:
131131
unset EESSI_USE_ARCHSPEC
132132
unset EESSI_USE_ARCHDETECT
133133
env | grep -E '(^EESSI_|^LMOD_RC|^LMOD_PACKAGE_PATH|^MODULEPATH)' | sort > "${sourceoutfile}"
134-
134+
135135
# Now compare the two results
136136
echo ""
137137
echo "Lmod initialisation:"
@@ -175,19 +175,19 @@ jobs:
175175
steps:
176176
- name: Check out software-layer repository
177177
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
178-
178+
179179
- name: Mount EESSI CernVM-FS repository
180180
uses: cvmfs-contrib/github-action-cvmfs@55899ca74cf78ab874bdf47f5a804e47c198743c # v4.0
181181
with:
182182
cvmfs_config_package: https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb
183183
cvmfs_http_proxy: DIRECT
184184
cvmfs_repositories: software.eessi.io
185-
185+
186186
- name: Test for identical environment after loading and unloading the EESSI module
187187
run: |
188188
# Initialise Lmod
189189
. /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/compat/linux/$(uname -m)/usr/share/Lmod/init/bash
190-
190+
191191
# Set our cpu path overrides according to our matrix
192192
if [[ "${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}" != "none" ]]; then
193193
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
@@ -204,7 +204,7 @@ jobs:
204204
205205
initial_env_file="initial_env.txt"
206206
module_cycled_file="load_unload_cycle.txt"
207-
207+
208208
# prepare Lmod, resetting it in a roundabout way given we don't want defaults set
209209
export MODULEPATH=init/modules:.github/workflows/modules
210210
module load fake_module
@@ -220,13 +220,13 @@ jobs:
220220
module load EESSI/${{matrix.EESSI_VERSION}}
221221
module unload EESSI/${{matrix.EESSI_VERSION}}
222222
env | grep -v _ModuleTable | sort > "${module_cycled_file}"
223-
223+
224224
# Now compare the two results (do not expose the files, as they contain the full environment!)
225225
if (diff "${initial_env_file}" "${module_cycled_file}" > /dev/null); then
226226
echo "Test for checking env variables PASSED"
227-
else
227+
else
228228
echo "Test for checking env variables FAILED" >&2
229-
diff --unified=0 "${initial_env_file}" "${module_cycled_file}"
229+
diff --unified=0 "${initial_env_file}" "${module_cycled_file}"
230230
exit 1
231231
fi
232232
@@ -248,27 +248,27 @@ jobs:
248248
steps:
249249
- name: Check out software-layer repository
250250
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
251-
251+
252252
- name: Mount EESSI CernVM-FS repository
253253
uses: cvmfs-contrib/github-action-cvmfs@55899ca74cf78ab874bdf47f5a804e47c198743c # v4.0
254254
with:
255255
cvmfs_config_package: https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb
256256
cvmfs_http_proxy: DIRECT
257257
cvmfs_repositories: software.eessi.io
258-
258+
259259
- name: Make sure we have a sticky EESSI module
260260
run: |
261261
# Initialise Lmod
262262
. /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/compat/linux/$(uname -m)/usr/share/Lmod/init/bash
263-
263+
264264
# Make sure we are using the module file from the repository
265265
export MODULEPATH=init/modules
266-
266+
267267
# Set the relevant environment variable and load the EESSI module
268268
export EESSI_MODULE_STICKY=1
269269
module load "EESSI/${{matrix.EESSI_VERSION}}"
270270
module list |& grep "EESSI/${{matrix.EESSI_VERSION}}"
271-
271+
272272
# Purge and check the module is still loaded
273273
module purge
274274
module list |& grep "EESSI/${{matrix.EESSI_VERSION}}"

0 commit comments

Comments
 (0)