From ff73540ada31f621a3c7313b57a91197c4563b38 Mon Sep 17 00:00:00 2001 From: maheshk2k <39314876+maheshk2k@users.noreply.github.com> Date: Sun, 3 May 2020 12:12:21 +0530 Subject: [PATCH 1/2] Update branch version while installing app Both bench init and get-app need to be on the same version branch. Mismatch results into errors while installing app --- development/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/development/README.md b/development/README.md index 9d421bf3..be8e7e04 100644 --- a/development/README.md +++ b/development/README.md @@ -117,16 +117,16 @@ bench --site mysite.localhost clear-cache To install an app we need to fetch it from the appropriate git repo, then install in on the appropriate site: You can check [VSCode container remote extension documentation](https://code.visualstudio.com/docs/remote/containers#_sharing-git-credentials-with-your-container) regarding git creedential sharing. - +Both frappe and erpnext must be on branch with same name. e.g. version-12 ```shell -bench get-app myapp https://github.com/myusername/myapp.git +bench get-app --branch version-12 myapp https://github.com/myusername/myapp.git bench --site mysite.localhost install-app myapp ``` For example, to install ERPNext (from the master branch): - +Both frappe and erpnext must be on branch with same name. e.g. version-12 ```shell -bench get-app erpnext https://github.com/frappe/erpnext.git +bench get-app --branch version-12 erpnext https://github.com/frappe/erpnext.git bench --site mysite.localhost install-app erpnext ``` From 28ea4671e8599be77ee7fc8f7ff0f886e481e580 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 3 May 2020 13:03:23 +0530 Subject: [PATCH 2/2] fix: development README info related to branches of apps [ci-skip] --- development/README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/development/README.md b/development/README.md index be8e7e04..44ec78f4 100644 --- a/development/README.md +++ b/development/README.md @@ -116,20 +116,24 @@ bench --site mysite.localhost clear-cache To install an app we need to fetch it from the appropriate git repo, then install in on the appropriate site: -You can check [VSCode container remote extension documentation](https://code.visualstudio.com/docs/remote/containers#_sharing-git-credentials-with-your-container) regarding git creedential sharing. -Both frappe and erpnext must be on branch with same name. e.g. version-12 +You can check [VSCode container remote extension documentation](https://code.visualstudio.com/docs/remote/containers#_sharing-git-credentials-with-your-container) regarding git credential sharing. + +To install custom app + ```shell +# --branch is optional, use it to point to branch on custom app repository bench get-app --branch version-12 myapp https://github.com/myusername/myapp.git bench --site mysite.localhost install-app myapp ``` -For example, to install ERPNext (from the master branch): -Both frappe and erpnext must be on branch with same name. e.g. version-12 +To install ERPNext (from the version-12 branch): + ```shell bench get-app --branch version-12 erpnext https://github.com/frappe/erpnext.git bench --site mysite.localhost install-app erpnext ``` +Note: Both frappe and erpnext must be on branch with same name. e.g. version-12 ### Start Frappe without debugging