From 15b2e1dc1021c891a9c44cb987d68deec3452575 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 7 Sep 2021 14:56:16 +0200 Subject: [PATCH 1/3] update meta info --- meta/main.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index edcda12..dbf92f8 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,28 +1,24 @@ --- galaxy_info: - author: L3D role_name: i3wm + author: do1jlr description: Install and configure i3wm on common linux distibutions (https://i3wm.org/) license: "MIT" - min_ansible_version: 2.3 - github_branch: master + min_ansible_version: 2.11 + github_branch: main platforms: - name: Archlinux versions: all - name: Debian - versions: - - stretch - - jessie + versions: all - name: Ubuntu - versions: - - bionic + versions: all - name: Fedora - versions: - - 28 - - 29 + versions: all galaxy_tags: - i3wm - - arch - desktop - linux + - xorg + - wayland dependencies: [] From dd2bc19a9ade464960a3bf42c34ab40a9041e34c Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 7 Sep 2021 15:04:43 +0200 Subject: [PATCH 2/3] update test and versionscheck --- .github/workflows/ansible-molecule.yml | 14 ++++++++++++++ tasks/versioncheck.yml | 8 +++----- 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/ansible-molecule.yml diff --git a/.github/workflows/ansible-molecule.yml b/.github/workflows/ansible-molecule.yml new file mode 100644 index 0000000..ec89550 --- /dev/null +++ b/.github/workflows/ansible-molecule.yml @@ -0,0 +1,14 @@ +--- +name: molecule testing + +# yamllint disable-line rule:truthy +on: push + +jobs: + molecule: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + path: "${{ github.repository }}" + - uses: gofrolist/molecule-action@v2 diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml index dca3e47..5128cc8 100644 --- a/tasks/versioncheck.yml +++ b/tasks/versioncheck.yml @@ -1,4 +1,7 @@ --- +# Copyright (c) 2021 L3D +# this file is released with the MIT license. +# License: https://github.com/roles-ansible/ansible_role_template/blob/main/LICENSE - name: Create directory for versionscheck become: true ansible.builtin.file: @@ -32,11 +35,6 @@ when: - playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck|bool -- name: check if '/etc/ansible-version/' is empty - ansible.builtin.find: - paths: '/etc/ansible-version/' - register: filesFound - - name: write new version to remote disk become: true ansible.builtin.copy: From c24fdb64f871f4bf4fac2e6df3213e663d82c9f4 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 7 Sep 2021 15:09:28 +0200 Subject: [PATCH 3/3] update actions --- .github/workflows/ansible-debian-bullseye.yml | 18 +++++++++++++++++ .github/workflows/ansible-debian-stable.yml | 6 +++++- .github/workflows/ansible-linting-check.yml | 6 +++++- .github/workflows/ansible-molecule.yml | 14 ------------- .github/workflows/galaxy.yml | 20 +++++++++++++++++++ .github/workflows/yamllint.yaml | 10 +++++----- 6 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/ansible-debian-bullseye.yml delete mode 100644 .github/workflows/ansible-molecule.yml create mode 100644 .github/workflows/galaxy.yml diff --git a/.github/workflows/ansible-debian-bullseye.yml b/.github/workflows/ansible-debian-bullseye.yml new file mode 100644 index 0000000..4b7c45d --- /dev/null +++ b/.github/workflows/ansible-debian-bullseye.yml @@ -0,0 +1,18 @@ +--- +name: Ansible check debian:bullseye + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: ansible check with debian:bullseye + uses: roles-ansible/check-ansible-debian-bullseye-action@main + with: + targets: "./" diff --git a/.github/workflows/ansible-debian-stable.yml b/.github/workflows/ansible-debian-stable.yml index e47f773..38a456d 100644 --- a/.github/workflows/ansible-debian-stable.yml +++ b/.github/workflows/ansible-debian-stable.yml @@ -2,7 +2,11 @@ name: Ansible check debian:stable # yamllint disable-line rule:truthy -on: [push, pull_request] +on: + push: + branches: '*' + pull_request: + branches: '*' jobs: build: diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 41dcb97..ab63487 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -2,7 +2,11 @@ name: Ansible Lint check # yamllint disable-line rule:truthy -on: [push, pull_request] +on: + push: + branches: '*' + pull_request: + branches: '*' jobs: build: diff --git a/.github/workflows/ansible-molecule.yml b/.github/workflows/ansible-molecule.yml deleted file mode 100644 index ec89550..0000000 --- a/.github/workflows/ansible-molecule.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: molecule testing - -# yamllint disable-line rule:truthy -on: push - -jobs: - molecule: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - path: "${{ github.repository }}" - - uses: gofrolist/molecule-action@v2 diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml new file mode 100644 index 0000000..b5dc0ec --- /dev/null +++ b/.github/workflows/galaxy.yml @@ -0,0 +1,20 @@ +--- +name: Galaxy release + +# yamllint disable-line rule:truthy +on: + push: + branches: ['main'] + release: + types: ['created'] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v2 + - name: galaxy + uses: robertdebock/galaxy-action@1.1.0 + with: + galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index 39c49f8..d4ad029 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/yamllint.yaml @@ -2,7 +2,11 @@ name: 'Yamllint GitHub Actions' # yamllint disable-line rule:truthy -on: [push, pull_request] +on: + push: + branches: '*' + pull_request: + branches: '*' jobs: yamllint: @@ -16,7 +20,3 @@ jobs: with: yamllint_file_or_dir: '.' yamllint_config_filepath: './.yamllint' - yamllint_strict: false - yamllint_comment: true -# env: -# GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }