From 89d50861d646abb96fe13d3838d6b0d0411f689e Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sat, 9 May 2020 22:10:13 +0200 Subject: [PATCH 1/2] Fix tutorial configuration --- tutorial/config/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorial/config/settings.py b/tutorial/config/settings.py index a4333e4f09..0e3913831c 100644 --- a/tutorial/config/settings.py +++ b/tutorial/config/settings.py @@ -43,7 +43,7 @@ ], 'container_platforms': [ { - 'name': 'Singularity', + 'type': 'Singularity', 'modules': ['Singularity'] } ], @@ -64,7 +64,7 @@ ], 'container_platforms': [ { - 'name': 'Singularity', + 'type': 'Singularity', 'modules': ['Singularity'] } ], From 7e8b948219cee3493715bfcca6945860e03b092c Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Mon, 11 May 2020 11:51:23 +0200 Subject: [PATCH 2/2] Try loading tutorial conifguration in CI when it changes --- ci-scripts/ci-runner.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/ci-runner.bash b/ci-scripts/ci-runner.bash index 8e8af1d3ec..f7ff3623f6 100644 --- a/ci-scripts/ci-runner.bash +++ b/ci-scripts/ci-runner.bash @@ -158,7 +158,7 @@ elif [ $CI_TUTORIAL -eq 1 ]; then # Run tutorial checks # Find modified or added tutorial checks tutorialchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \ - grep -e '^tutorial/(?!config/).*\.py') ) + grep -e '^tutorial/.*\.py') ) if [ ${#tutorialchecks[@]} -ne 0 ]; then tutorialchecks_path=""