From 61778d505804df007a04583b5e7710eb8878bd9a Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 15 Sep 2023 16:51:56 +0530 Subject: [PATCH] ci: restart bench before final migrate (#37104) Also remove few patches which are now handled automatically --- .github/workflows/patch.yml | 2 ++ erpnext/patches.txt | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index a633414fb9c..07b8de7a900 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -139,9 +139,11 @@ jobs: git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA" + pgrep honcho | xargs kill rm -rf ~/frappe-bench/env bench -v setup env bench pip install -e ./apps/erpnext + bench start &>> ~/frappe-bench/bench_start.log & bench --site test_site migrate diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 7a07f5679a7..d0ee2e4dc4e 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -339,9 +339,6 @@ execute:frappe.defaults.clear_default("fiscal_year") erpnext.patches.v15_0.remove_exotel_integration erpnext.patches.v14_0.single_to_multi_dunning execute:frappe.db.set_single_value('Selling Settings', 'allow_negative_rates_for_items', 0) -execute:frappe.delete_doc('DocType', 'Twitter Settings', ignore_missing=True) -execute:frappe.delete_doc('DocType', 'LinkedIn Settings', ignore_missing=True) -execute:frappe.delete_doc('DocType', 'Social Media Post', ignore_missing=True) erpnext.patches.v15_0.correct_asset_value_if_je_with_workflow erpnext.patches.v15_0.delete_woocommerce_settings_doctype # below migration patch should always run last