mirror of
https://github.com/frappe/bench.git
synced 2025-03-15 05:52:23 +00:00
Merge remote-tracking branch 'upstream/develop' into staging
* upstream/develop: fix(ansible): Use include_tasks instead of include fix: ERROR! [DEPRECATED] Update Development Docs URL (#1557) Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
commit
92fbfb1f81
@ -24,7 +24,7 @@
|
||||
state: present
|
||||
|
||||
- name: configure mariadb
|
||||
include: roles/mariadb/tasks/main.yml
|
||||
include_tasks: roles/mariadb/tasks/main.yml
|
||||
vars:
|
||||
mysql_conf_tpl: roles/mariadb/files/mariadb_config.cnf
|
||||
|
||||
@ -32,10 +32,10 @@
|
||||
pip: name=mysql-python version=1.2.5
|
||||
|
||||
# setup frappe-bench
|
||||
- include: includes/setup_bench.yml
|
||||
- include_tasks: includes/setup_bench.yml
|
||||
|
||||
# setup development environment
|
||||
- include: includes/setup_dev_env.yml
|
||||
- include_tasks: includes/setup_dev_env.yml
|
||||
when: not production
|
||||
|
||||
...
|
@ -1,11 +1,11 @@
|
||||
---
|
||||
- include: centos.yml
|
||||
- include_tasks: centos.yml
|
||||
when: ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 6
|
||||
|
||||
- include: ubuntu-trusty.yml
|
||||
- include_tasks: ubuntu-trusty.yml
|
||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
|
||||
|
||||
- include: ubuntu-xenial_bionic.yml
|
||||
- include_tasks: ubuntu-xenial_bionic.yml
|
||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int >= 16
|
||||
|
||||
- name: Add configuration
|
||||
|
@ -232,7 +232,7 @@ def setup_dev_instance(project: str):
|
||||
check=True,
|
||||
)
|
||||
cprint(
|
||||
"Please go through the Development Documentation: https://github.com/frappe/frappe_docker/tree/main/development to fully complete the setup.",
|
||||
"Please go through the Development Documentation: https://github.com/frappe/frappe_docker/tree/main/docs/development.md to fully complete the setup.",
|
||||
level=2,
|
||||
)
|
||||
logging.info("Development Setup completed")
|
||||
|
Loading…
x
Reference in New Issue
Block a user