Skip to content

ci: bump mariadb to 11.x by ankush [frappe] PR#25658

Bot Dokos requested to merge ft-pr-25658 into develop

From: https://github.com/frappe/frappe/pull/25658
Date: 2024-03-26 17:47:56+00:00


Diagnostics

Conflicts detected for source commit: b0da61413c10f45dd1d22769f8a64c24de40ea45
- DU .github/workflows/patch-mariadb-tests.yml
- DU .github/workflows/server-tests.yml
- DU .github/workflows/ui-tests.yml
Cleaning files from denylist:
 .github/workflows/patch-mariadb-tests.yml | 170 ++++++++++++++++++++++
 .github/workflows/server-tests.yml        | 210 +++++++++++++++++++++++++++
 .github/workflows/ui-tests.yml            | 226 ++++++++++++++++++++++++++++++
 3 files changed, 606 insertions(+)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-25658

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-25658

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports