Skip to content

Commit ae372e0

Browse files
Merge pull request #3518 from boegel/GA_CI_fixes
fix GitHub Actions workflow for test suite: run outside of repo checkout + also test bootstrap script with Python 3.9
2 parents 3131501 + 3fc575f commit ae372e0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/unit_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ jobs:
130130
EASYBUILD_MODULE_SYNTAX: ${{matrix.module_syntax}}
131131
TEST_EASYBUILD_MODULE_SYNTAX: ${{matrix.module_syntax}}
132132
run: |
133+
# run tests *outside* of checked out easybuild-framework directory,
134+
# to ensure we're testing installed version (see previous step)
135+
cd $HOME
133136
# initialize environment for modules tool
134137
if [ -f $HOME/moduleshome ]; then export MODULESHOME=$(cat $HOME/moduleshome); fi
135138
source $(cat $HOME/mod_init); type module
@@ -167,9 +170,6 @@ jobs:
167170
test "x$PRINTED_MSG" = "x" || (echo "ERROR: Found printed messages in output of test suite\n${PRINTED_MSG}" && exit 1)
168171
169172
- name: test bootstrap script
170-
# skip testing of bootstrap script with Python 3.9,
171-
# until an EasyBuild release that is compatible with Python 3.9 is available
172-
if: ${{ matrix.python != 3.9 }}
173173
run: |
174174
# (re)initialize environment for modules tool
175175
if [ -f $HOME/moduleshome ]; then export MODULESHOME=$(cat $HOME/moduleshome); fi

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def find_rel_test():
5757
current = os.getcwd()
5858
os.chdir(basedir)
5959
res = []
60-
for subdir in ["sandbox", "easyconfigs", "modules"]:
60+
for subdir in ["easyconfigs", "easystacks", "modules", "sandbox"]:
6161
res.extend([os.path.join(root, filename)
6262
for root, dirnames, filenames in os.walk(subdir)
6363
for filename in filenames if os.path.isfile(os.path.join(root, filename))])

0 commit comments

Comments
 (0)