Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/staging' into v5.x
Browse files Browse the repository at this point in the history
* upstream/staging:
  fix(ansible): Use include_tasks instead of include
  fix: ERROR! [DEPRECATED]
  Update Development Docs URL (#1557)

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
  • Loading branch information
akhilnarang committed Aug 19, 2024
2 parents e909338 + 92fbfb1 commit f50988b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions bench/playbooks/macosx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
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

- name: Install MySQLdb in global env
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

...
6 changes: 3 additions & 3 deletions bench/playbooks/roles/mariadb/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion easy-install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit f50988b

Please sign in to comment.