ci: chore revert using branched bench

merge after is released: frappe/bench#1600
blaggacao · Nov 26, 2024 · 361afaa · 361afaa
1 parent 894c7d8
commit 361afaa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -172,9 +172,7 @@ runs:
       source ${GITHUB_WORKSPACE}/env/bin/activate
       pip install --quiet --upgrade pip
 
-      # pip install --quiet frappe-bench
-      # revert after merge: https://github.com/frappe/bench/pull/1600
-      pip install --quiet git+https://github.com/blaggacao/bench.git@feat/add-direct-config-module-calling
+      pip install --quiet frappe-bench
 
       python -m bench.config.common_site_config ${GITHUB_WORKSPACE}
       python -m bench.config.redis ${GITHUB_WORKSPACE}

diff --git a/.github/workflows/_base-migration.yml b/.github/workflows/_base-migration.yml
@@ -108,9 +108,7 @@ jobs:
             if rm -rf ${GITHUB_WORKSPACE}/env && python -m venv ${GITHUB_WORKSPACE}/env; then
                 source ${GITHUB_WORKSPACE}/env/bin/activate
                 pip install --quiet --upgrade pip
-                # pip install --quiet frappe-bench
-                # revert after merge: https://github.com/frappe/bench/pull/1600
-                pip install --quiet git+https://github.com/blaggacao/bench.git@feat/add-direct-config-module-calling
+                pip install --quiet frappe-bench
                 echo "Environment setup completed."
             else
                 echo "Environment setup failed." >&2