fix: add option to install mergetool
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
a9a707c0fb
commit
bb4d6a1c82
@ -1,5 +1,8 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
|
git_install_merge_tool: false
|
||||||
|
git_package_name_merge_tool: meld
|
||||||
|
|
||||||
git_users: []
|
git_users: []
|
||||||
# github:
|
# github:
|
||||||
# config:
|
# config:
|
||||||
@ -9,4 +12,3 @@ git_users: []
|
|||||||
# name: "root"
|
# name: "root"
|
||||||
# email: root@localhost
|
# email: root@localhost
|
||||||
# signingKey: gpg-fingerprint
|
# signingKey: gpg-fingerprint
|
||||||
|
|
@ -4,10 +4,19 @@
|
|||||||
ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
|
ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
|
||||||
|
|
||||||
- name: Install git and dependencies
|
- name: Install git and dependencies
|
||||||
|
vars:
|
||||||
|
_git_package_names: "{{ git_package_names }}"
|
||||||
|
block:
|
||||||
|
- name: Add merge tool
|
||||||
|
ansible.builtin.set_fact:
|
||||||
|
_git_package_names: "{{ _git_package_names + [ git_package_name_merge_tool ] }}"
|
||||||
|
when: git_install_merge_tool is defined and
|
||||||
|
git_install_merge_tool
|
||||||
|
- name: Install git and dependencies
|
||||||
ansible.builtin.package:
|
ansible.builtin.package:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: present
|
state: present
|
||||||
with_items: "{{ git_package_names }}"
|
with_items: "{{ _git_package_names }}"
|
||||||
|
|
||||||
- name: Configure git
|
- name: Configure git
|
||||||
ansible.builtin.include_tasks: git_user.yml
|
ansible.builtin.include_tasks: git_user.yml
|
||||||
|
Loading…
Reference in New Issue
Block a user