Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fall back to ionic7 app runtime #293

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Fall back to ionic7 app runtime #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d59e070
Fall back to ionic7 app runtime
NoelDeMartin Jul 1, 2024
16fbaa9
Update app version for legacy tests
NoelDeMartin Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions bin/moodle-docker-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions tests/app-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down