From 6ed894795fb12b01cd4aa5a8cb87771666637ed6 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 1 Sep 2021 03:10:34 +0200 Subject: [PATCH 1/3] fixing linting --- .gitignore | 1 + meta/main.yml | 2 +- tasks/main.yml | 6 ++++-- vars/main.yml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..16d3c4d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.cache diff --git a/meta/main.yml b/meta/main.yml index 369802b..9c7c51c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,7 +12,7 @@ galaxy_info: - name: Ubuntu versions: all galaxy_tags: - - APU + - apu - firmware - rtl_nic dependencies: [] diff --git a/tasks/main.yml b/tasks/main.yml index 5ceb8a4..1dd924d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,8 +1,10 @@ --- -- ansible.builtin.include_tasks: versioncheck.yml +- name: run optional versioncheck + ansible.builtin.include_tasks: versioncheck.yml when: submodules_versioncheck|bool -- ansible.builtin.include_tasks: kernel_firmware_download.yml +- name: download additional firmware on apu board + ansible.builtin.include_tasks: kernel_firmware_download.yml when: - ansible_board_name == 'APU' - ansible_product_name == 'APU' diff --git a/vars/main.yml b/vars/main.yml index 3e51fbd..9bdce72 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ --- # versionscheck -playbook_version_number: 4 +playbook_version_number: 5 playbook_version_path: 'do1jlr.rtl_nic_firmware.version' From 833d7442fe46481aef7b6f502e0ee786522ef0b6 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 1 Sep 2021 03:12:37 +0200 Subject: [PATCH 2/3] remove non-debian checks --- .github/workflows/ansible-alpine-latest.yml | 18 ------------------ .github/workflows/ansible-archlinux-latest.yml | 18 ------------------ .github/workflows/ansible-centos-centos7.yml | 18 ------------------ .github/workflows/ansible-centos-centos8.yml | 18 ------------------ .github/workflows/ansible-centos-latest.yml | 18 ------------------ .github/workflows/ansible-fedora-31.yml | 18 ------------------ .github/workflows/ansible-fedora-32.yml | 18 ------------------ .github/workflows/ansible-fedora-33.yml | 18 ------------------ .github/workflows/ansible-fedora-latest.yml | 18 ------------------ 9 files changed, 162 deletions(-) delete mode 100644 .github/workflows/ansible-alpine-latest.yml delete mode 100644 .github/workflows/ansible-archlinux-latest.yml delete mode 100644 .github/workflows/ansible-centos-centos7.yml delete mode 100644 .github/workflows/ansible-centos-centos8.yml delete mode 100644 .github/workflows/ansible-centos-latest.yml delete mode 100644 .github/workflows/ansible-fedora-31.yml delete mode 100644 .github/workflows/ansible-fedora-32.yml delete mode 100644 .github/workflows/ansible-fedora-33.yml delete mode 100644 .github/workflows/ansible-fedora-latest.yml diff --git a/.github/workflows/ansible-alpine-latest.yml b/.github/workflows/ansible-alpine-latest.yml deleted file mode 100644 index 07bfff0..0000000 --- a/.github/workflows/ansible-alpine-latest.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check alpine:latest - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with alpine:latest - uses: roles-ansible/check-ansible-alpine-latest-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-archlinux-latest.yml b/.github/workflows/ansible-archlinux-latest.yml deleted file mode 100644 index e823f0c..0000000 --- a/.github/workflows/ansible-archlinux-latest.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check archlinux:latest - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with archlinux:latest - uses: roles-ansible/check-ansible-archlinux-latest-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-centos-centos7.yml b/.github/workflows/ansible-centos-centos7.yml deleted file mode 100644 index 401d2c0..0000000 --- a/.github/workflows/ansible-centos-centos7.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check centos:centos7 - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with ubuntu:centos7 - uses: roles-ansible/check-ansible-centos-centos7-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-centos-centos8.yml b/.github/workflows/ansible-centos-centos8.yml deleted file mode 100644 index f20097b..0000000 --- a/.github/workflows/ansible-centos-centos8.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check centos:centos8 - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with ubuntu:centos8 - uses: roles-ansible/check-ansible-centos-centos8-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-centos-latest.yml b/.github/workflows/ansible-centos-latest.yml deleted file mode 100644 index 94eb54b..0000000 --- a/.github/workflows/ansible-centos-latest.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check centos:latest - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with ubuntu:latest - uses: roles-ansible/check-ansible-centos-latest-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-fedora-31.yml b/.github/workflows/ansible-fedora-31.yml deleted file mode 100644 index 08502fe..0000000 --- a/.github/workflows/ansible-fedora-31.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check fedora:31 - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with fedora:31 - uses: roles-ansible/check-ansible-fedora-31-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-fedora-32.yml b/.github/workflows/ansible-fedora-32.yml deleted file mode 100644 index e362dd4..0000000 --- a/.github/workflows/ansible-fedora-32.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check fedora:32 - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with fedora:32 - uses: roles-ansible/check-ansible-fedora-32-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-fedora-33.yml b/.github/workflows/ansible-fedora-33.yml deleted file mode 100644 index 70c52ad..0000000 --- a/.github/workflows/ansible-fedora-33.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check fedora:33 - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with fedora:33 - uses: roles-ansible/check-ansible-fedora-33-action@master - with: - targets: "./" diff --git a/.github/workflows/ansible-fedora-latest.yml b/.github/workflows/ansible-fedora-latest.yml deleted file mode 100644 index 7cfbdf7..0000000 --- a/.github/workflows/ansible-fedora-latest.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Ansible check fedora:latest - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: ansible check with fedora:latest - uses: roles-ansible/check-ansible-fedora-latest-action@master - with: - targets: "./" From 94971e6f72b0447db8059c4357ad1f7c0ea8d4ed Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 1 Sep 2021 10:55:48 +0200 Subject: [PATCH 3/3] fix linting for meta file --- meta/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 9c7c51c..df5ab6c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -14,5 +14,6 @@ galaxy_info: galaxy_tags: - apu - firmware - - rtl_nic + - rtl + - nic dependencies: []