From 07b1462e603984ea9f3bb58567bacec3d8ccc86c Mon Sep 17 00:00:00 2001 From: Nick Spinner Date: Thu, 9 May 2024 22:30:13 -0700 Subject: [PATCH 1/3] Update Development Docs URL (#1557) --- easy-install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easy-install.py b/easy-install.py index e1890380e..2e22e2191 100755 --- a/easy-install.py +++ b/easy-install.py @@ -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") From caa5fa0eadc0c00edc96b2fc765d2720192bb224 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 28 May 2024 17:38:55 +0200 Subject: [PATCH 2/3] fix: ERROR! [DEPRECATED] --- bench/playbooks/roles/mariadb/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bench/playbooks/roles/mariadb/tasks/main.yml b/bench/playbooks/roles/mariadb/tasks/main.yml index b4e145ad1..c61960b2c 100644 --- a/bench/playbooks/roles/mariadb/tasks/main.yml +++ b/bench/playbooks/roles/mariadb/tasks/main.yml @@ -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 From cbd703d436ee6b4917db865f1e526e7ae50b3fd3 Mon Sep 17 00:00:00 2001 From: Corentin Forler Date: Fri, 31 May 2024 13:45:12 +0200 Subject: [PATCH 3/3] fix(ansible): Use include_tasks instead of include --- bench/playbooks/macosx.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bench/playbooks/macosx.yml b/bench/playbooks/macosx.yml index 12be8f04e..ae0ce2f59 100644 --- a/bench/playbooks/macosx.yml +++ b/bench/playbooks/macosx.yml @@ -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 ... \ No newline at end of file