[fix] release + mariadb restart for mac

bench/commands/utils.py

@@ -116,7 +116,7 @@ def backup_all_sites():
 @click.option('--master', default='master')
 def release(app, bump_type, develop, master):
 	"Release app (internal to the Frappe team)"
-	from .release import release
+	from bench.release import release
 	repo = os.path.join('apps', app)
 	release(repo, bump_type, develop, master)
 

bench/release.py

@@ -34,6 +34,11 @@ def create_release(repo_path, version, remote='origin', develop_branch='develop'
 	repo.create_tag(tag_name, message='Release {}'.format(version))
 	g.checkout(develop_branch)
 	g.merge(master_branch)
+
+	if develop_branch != 'develop':
+		g.checkout('develop')
+		g.merge(master_branch)
+
 	return tag_name
 
 def push_release(repo_path, develop_branch='develop', master_branch='master'):

playbooks/develop/includes/setup_mariadb.yml

@@ -22,12 +22,23 @@
 
   - name: Add configuration
     template: src={{ mysql_config_template }} dest={{ mysql_conf_dir }}/frappe.cnf owner=root mode=0644
-    notify:
-      - restart mysql
     become: yes
     become_method: sudo
 
-  - name: restart mysql
+  - name: restart mysql linux
     service: name=mysql state=restarted
     become: yes
     become_method: sudo
+    when: ansible_os_family == 'RedHat' or ansible_os_family == 'Debian'
+
+  - name: add mysql to mac startup
+    file: src=/usr/local/opt/mariadb/homebrew.mxcl.mariadb.plist path=~/Library/LaunchAgents/homebrew.mxcl.mariadb.plist state=link force=yes
+    when: ansible_distribution == 'MacOSX'
+
+  - name: stop mysql mac
+    command: launchctl unload ~/Library/LaunchAgents/homebrew.mxcl.mariadb.plist
+    when: ansible_distribution == 'MacOSX'
+
+  - name: start mysql mac
+    command: launchctl load ~/Library/LaunchAgents/homebrew.mxcl.mariadb.plist
+    when: ansible_distribution == 'MacOSX'