diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index fe02351a5a..2ca0a2a681 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -64,9 +64,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: | - 3.7 - 3.10 + python-version: "3.10" - name: Setup Node uses: actions/setup-node@v3 @@ -112,8 +110,8 @@ jobs: - name: Run Patch Tests run: | cd ~/frappe-bench/ - wget https://frappeframework.com/files/v10-frappe.sql.gz - bench --site test_site --force restore ~/frappe-bench/v10-frappe.sql.gz + wget https://frappeframework.com/files/v13-frappe.sql.gz + bench --site test_site --force restore ~/frappe-bench/v13-frappe.sql.gz source env/bin/activate cd apps/frappe/ @@ -121,7 +119,6 @@ jobs: function update_to_version() { version=$1 - py=$2 branch_name="version-$version-hotfix" echo "Updating to v$version" @@ -130,21 +127,20 @@ jobs: pgrep honcho | xargs kill rm -rf ~/frappe-bench/env - bench -v setup env --python $py - bench start &> ~/frappe-bench/bench_start.log & + bench -v setup env + bench start &>> ~/frappe-bench/bench_start.log & bench --site test_site migrate } - update_to_version 12 python3.7 - update_to_version 13 python3.7 - - update_to_version 14 python3.10 + update_to_version 14 echo "Updating to last commit" + pgrep honcho | xargs kill rm -rf ~/frappe-bench/env git checkout -q -f "$GITHUB_SHA" bench -v setup env + bench start &>> ~/frappe-bench/bench_start.log & bench --site test_site migrate - name: Show bench output diff --git a/frappe/patches.txt b/frappe/patches.txt index 0a96030dcb..83db10d905 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -228,6 +228,5 @@ frappe.patches.v15_0.remove_background_jobs_from_dropdown frappe.desk.doctype.form_tour.patches.introduce_ui_tours execute:frappe.delete_doc_if_exists("Workspace", "Customization") execute:frappe.db.set_single_value("Document Naming Settings", "default_amend_naming", "Amend Counter") -execute:frappe.delete_doc_if_exists("DocType", "Error Snapshot") frappe.patches.v15_0.move_event_cancelled_to_status frappe.patches.v15_0.set_file_type