Skip to content

chore(deps): bump actions/cache from 3 to 4 by dependabot[bot] [frappe] PR#24484

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

From: https://github.com/frappe/frappe/pull/24484
Date: 2024-01-22 10:36:26+00:00


Diagnostics

Conflicts detected for source commit: 44e4c8763628684c606145d2d01b2256e367fabc
- DU .github/workflows/linters.yml
- 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/linters.yml             |  97 +++++++++++++
 .github/workflows/patch-mariadb-tests.yml | 167 +++++++++++++++++++++++
 .github/workflows/server-tests.yml        | 200 +++++++++++++++++++++++++++
 .github/workflows/ui-tests.yml            | 220 ++++++++++++++++++++++++++++++
 4 files changed, 684 insertions(+)


Conflicts detected for source commit: 482334861d9cb66d8517a57f102d8ccc8afb33fe
- DU .github/workflows/linters.yml
- 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/linters.yml             |  97 +++++++++++++
 .github/workflows/patch-mariadb-tests.yml | 167 +++++++++++++++++++++++
 .github/workflows/server-tests.yml        | 200 +++++++++++++++++++++++++++
 .github/workflows/ui-tests.yml            | 220 ++++++++++++++++++++++++++++++
 4 files changed, 684 insertions(+)


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

# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks

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

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

Merge request reports