File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -43,11 +43,11 @@ jobs:
4343 os : linux
4444 script : npm run build --bailOnLintError true --typeCheckOnLint true
4545 - stage : mirror
46- if : branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp
46+ if : branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp AND type != cron
4747 os : linux
4848 script : scripts/mirror.sh
4949 - stage : prepare
50- if : branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1
50+ if : branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1 AND type != cron
5151 os : linux
5252 script : scripts/aot.sh
5353 - stage : build
Original file line number Diff line number Diff line change @@ -41,14 +41,16 @@ $dockercompose pull
4141$dockercompose up -d
4242$dockerscripts /moodle-docker-wait-for-db
4343$dockerscripts /moodle-docker-wait-for-app
44- $dockercompose exec -T webserver php admin/tool/behat/cli/init.php
44+
45+ $dockercompose exec -T webserver sh -c " php admin/tool/behat/cli/init.php"
46+ notify_on_error_exit " e2e failed initializing behat"
4547
4648# Run tests
4749for tags in " $@ "
4850do
4951 print_title " Running e2e tests ($tags )"
5052
51- $dockercompose exec -T webserver php admin/tool/behat/cli/run.php --tags=" $tags "
53+ $dockercompose exec -T webserver sh -c " php admin/tool/behat/cli/run.php --tags=\ "$tags \" "
5254 notify_on_error_exit " e2e failed on $tags "
5355done
5456
You can’t perform that action at this time.
0 commit comments