diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 0996001..1a76d38 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: 'Checkout git repo' - uses: actions/checkout@v4.1.1 + - name: Checkout git repo + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/j2lint-check.yml b/.github/workflows/j2lint-check.yml index 3f74620..00c7861 100644 --- a/.github/workflows/j2lint-check.yml +++ b/.github/workflows/j2lint-check.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: 'Checkout git repo' - uses: actions/checkout@v4.1.1 + - name: Checkout git repo + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/yamllint-check.yml b/.github/workflows/yamllint-check.yml index 48d9af2..5e62f57 100644 --- a/.github/workflows/yamllint-check.yml +++ b/.github/workflows/yamllint-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: 'Checkout git repo' + - name: Checkout git repo uses: actions/checkout@v4 with: submodules: true diff --git a/tasks/main.yml b/tasks/main.yml index dab8e7a..c83e14c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,17 +1,21 @@ --- - name: Run Optional versionscheck - ansible.builtin.include_tasks: versioncheck.yml + ansible.builtin.include_tasks: + file: versioncheck.yml when: submodules_versioncheck | bool - name: Gather os specific variables - ansible.builtin.include_vars: "{{ item }}" + ansible.builtin.include_vars: + file: "{{ item }}" with_first_found: - "vars/{{ ansible_os_family }}.yml" - "vars/os_fallback.yml" - name: Install MDNS requirements - ansible.builtin.include_tasks: install.yml + ansible.builtin.include_tasks: + file: install.yml - name: Configure /etc/nsswitch.conf - ansible.builtin.include_tasks: nsswitch.yml + ansible.builtin.include_tasks: + file: nsswitch.yml when: avahi_client__configure_nsswitch | bool diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml index dd22a1a..e660e3e 100644 --- a/tasks/versioncheck.yml +++ b/tasks/versioncheck.yml @@ -16,15 +16,14 @@ src: "/etc/.ansible-version/{{ playbook_version_path }}" register: playbook_version when: submodules_versioncheck | bool - ignore_errors: true failed_when: false -- name: Print remote role version +- name: Print remote role version # noqa: H500 ansible.builtin.debug: msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}" when: submodules_versioncheck | bool -- name: Print locale role version +- name: Print locale role version # noqa: H500 ansible.builtin.debug: msg: "Local role version: '{{ playbook_version_number | string }}'." when: submodules_versioncheck | bool diff --git a/vars/main.yml b/vars/main.yml index 428a967..d118d23 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,3 @@ --- -playbook_version_number: 9 +playbook_version_number: 10 playbook_version_path: 'do1jlr.avahi_client.version'