From d59e070a599e5a5da4b2a1f0d45c9f0524521c80 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Mon, 1 Jul 2024 09:10:23 +0200 Subject: [PATCH 1/2] Fall back to ionic7 app runtime --- bin/moodle-docker-compose | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/moodle-docker-compose b/bin/moodle-docker-compose index ee0078ce855..72950a8a8a2 100755 --- a/bin/moodle-docker-compose +++ b/bin/moodle-docker-compose @@ -89,13 +89,7 @@ then export MOODLE_DOCKER_APP_RUNTIME="ionic5" fi else - # TODO always default to ionic7 after 4.4.0 release - if [[ $appversion = "latest"* ]]; - then - export MOODLE_DOCKER_APP_RUNTIME="ionic5" - else - export MOODLE_DOCKER_APP_RUNTIME="ionic7" - fi + export MOODLE_DOCKER_APP_RUNTIME="ionic7" fi fi fi From 16fbaa905d47db9289ad5f237e4e17d55fed9174 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Mon, 1 Jul 2024 10:54:29 +0200 Subject: [PATCH 2/2] Update app version for legacy tests Older versions of the LMS won't work with the app because they need the patch introduced in MDL-80784 --- .github/workflows/ci.yml | 8 ++++---- tests/app-setup.sh | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e34bf5bf1f..48f58ed5975 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -252,10 +252,10 @@ jobs: - { branch: MOODLE_402_STABLE, php: "8.0", suite: app, app-version: "latest-test" } - { branch: MOODLE_401_STABLE, php: "8.1", suite: app, app-version: "latest-test" } - { branch: MOODLE_401_STABLE, php: "7.4", suite: app, app-version: "latest-test" } - - { branch: MOODLE_400_STABLE, php: "8.0", suite: app, app-version: "latest-test" } - - { branch: MOODLE_400_STABLE, php: "7.3", suite: app, app-version: "latest-test" } - - { branch: MOODLE_311_STABLE, php: "8.0", suite: app, app-version: "latest-test" } - - { branch: MOODLE_311_STABLE, php: "7.3", suite: app, app-version: "latest-test" } + - { branch: MOODLE_400_STABLE, php: "8.0", suite: app, app-version: "4.3.0-test" } + - { branch: MOODLE_400_STABLE, php: "7.3", suite: app, app-version: "4.3.0-test" } + - { branch: MOODLE_311_STABLE, php: "8.0", suite: app, app-version: "4.3.0-test" } + - { branch: MOODLE_311_STABLE, php: "7.3", suite: app, app-version: "4.3.0-test" } steps: - name: Checking out moodle-docker diff --git a/tests/app-setup.sh b/tests/app-setup.sh index 6245dadd5e6..50ae964d5ce 100755 --- a/tests/app-setup.sh +++ b/tests/app-setup.sh @@ -24,12 +24,14 @@ then docker run --volume $basedir/app:/app --workdir /app node:$nodeversion bash -c "npm ci" elif [ "$SUITE" = "app" ]; then - isdevelop=`echo $MOODLE_DOCKER_APP_VERSION | grep -E -o "(next)|(latest)"` + branch=`echo $MOODLE_DOCKER_APP_VERSION | grep -P -o "next|latest|\d\.\d\.\d"` - branch="latest" - if [ "$isdevelop" = "next" ]; + if [ "$branch" = "next" ]; then branch="main" + elif [ "$branch" != "latest" ]; + then + branch="v$branch" fi git clone --branch "$branch" --depth 1 https://github.com/moodlehq/moodle-local_moodleappbehat $basedir/moodle/local/moodleappbehat