fix: add option to install mergetool
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Markus Pesch 2023-12-20 12:05:23 +01:00
parent a9a707c0fb
commit bb4d6a1c82
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
2 changed files with 16 additions and 5 deletions

View File

@ -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

View File

@ -3,11 +3,20 @@
- name: Include OS-specific variables - name: Include OS-specific variables
ansible.builtin.include_vars: "{{ ansible_os_family }}.yml" ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
- 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 - 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