Merge pull request #1 from do1jlr:action

update action checks
replace scrot with maim

.github/FUNDING.yml

@@ -1,5 +1,5 @@
+---
 # These are supported funding model platforms
 
 github: [do1jlr]
 liberapay: L3D
-custom: https://paypal.me/c3woc

.github/workflows/ansible-archlinux-latest.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-centos-centos7.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-centos-centos8.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-centos-latest.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-debian-buster.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:buster
+
+# 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:buster
+        uses: roles-ansible/check-ansible-debian-buster-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-debian-latest.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check debian: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 debian:latest
+        uses: roles-ansible/check-ansible-debian-latest-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-debian-sid.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:sid
+
+# 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:sid
+        uses: roles-ansible/check-ansible-debian-sid-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-debian-stable.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:stable
+
+# 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:stable
+        uses: roles-ansible/check-ansible-debian-stable-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-debian-stretch.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:stretch
+
+# 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:stretch
+        uses: roles-ansible/check-ansible-debian-stretch-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-fedora-31.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-fedora-32.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-fedora-33.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-fedora-latest.yml

@@ -0,0 +1,18 @@
+---
+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: "./"

.github/workflows/ansible-linting-check.yml

@@ -0,0 +1,22 @@
+---
+name: Ansible Lint check
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Lint Ansible Playbook
+        uses: ansible/ansible-lint-action@master
+        with:
+          targets: "."
+          # [required]
+          # Paths to ansible files (i.e., playbooks, tasks, handlers etc..)
+          args: ""
+          # [optional]

.github/workflows/ansible-linting-chek.yml

@@ -1,20 +0,0 @@
-name: Ansible Lint check
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Lint Ansible Playbook
-      uses: ansible/ansible-lint-action@master
-      with:
-        targets: "."
-        # [required]
-        # Paths to ansible files (i.e., playbooks, tasks, handlers etc..)
-        args: ""
-        # [optional]

.github/workflows/ansible-ubuntu-bionic.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check ubuntu:bionic
+
+# 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:bionic
+        uses: roles-ansible/check-ansible-ubuntu-bionic-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-ubuntu-latest.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check ubuntu: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-ubuntu-latest-action@master
+        with:
+          targets: "./"

.github/workflows/ansible-ubuntu-trusty.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible check ubuntu:trusty
+
+# 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:trusty
+        uses: roles-ansible/check-ansible-ubuntu-trusty-action@master
+        with:
+          targets: "./"

.github/workflows/yamllint.yaml

@@ -0,0 +1,22 @@
+---
+name: 'Yamllint GitHub Actions'
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  yamllint:
+    name: 'Yamllint'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@master
+      - name: 'Yamllint'
+        uses: karancode/yamllint-github-action@master
+        with:
+          yamllint_file_or_dir: '.'
+          yamllint_config_filepath: './.yamllint'
+          yamllint_strict: false
+          yamllint_comment: true
+#       env:
+#         GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }

.travis.yml

@@ -1,25 +0,0 @@
----
-sudo: required
-env:
-  - distribution: fedora
-    version: 29
-  - distribution: fedora
-    version: 28
-  - distribution: ubuntu
-    version: bionic
-  - distribution: debian
-    version: stretch
-services:
-  - docker
-before_install:
-  - 'sudo docker pull ${distribution}:${version}'
-  - 'sudo docker build --no-cache --rm --file=travis/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible travis'
-script:
-  - container_id=$(mktemp)
-  - 'sudo docker run --detach --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro --volume="${PWD}":/etc/ansible/roles/travis_test:ro ${distribution}-${version}:ansible > "${container_id}"'
-  - 'sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook -v /etc/ansible/roles/travis_test/travis/test.yml --syntax-check'
-  - 'sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook -v /etc/ansible/roles/travis_test/travis/test.yml'
-  - 'sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook -v /etc/ansible/roles/travis_test/travis/test.yml'
-  - 'sudo docker rm -f "$(cat ${container_id})"'
-notifications:
-    webhooks: https://galaxy.ansible.com/api/v1/notifications/

.yamllint

@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules:
@@ -8,4 +9,4 @@ rules:
     max-spaces-inside: 1
     level: error
   line-length: disable
-  comments-indentation: disable
+  comments-indentation: disable

defaults/main.yml

@@ -50,7 +50,7 @@ i3wm_copy_wallpapers: true
 
 disable_screensaver: true
 enable_lock_after_time: false
-lock_after_time: '200' # minutes to wait until your screen is locked
+lock_after_time: '200'  # minutes to wait until your screen is locked
 
 # version check for this role?
 submodules_versioncheck: true

tasks/setup-Archlinux.yml

@@ -3,5 +3,5 @@
   pacman:
     name: "{{ i3_packages }}"
     state: present
-    update_cache: yes
+    update_cache: true
   become: true

tasks/variables.yml

@@ -29,19 +29,19 @@
   set_fact:
     i3_keybindings: "{{ __i3_keybindings | list }}"
   when:
-   - i3_keybindings is not defined
-   - __i3_keybindings is defined
+    - i3_keybindings is not defined
+    - __i3_keybindings is defined
 
 - name: define extra i3 keybindings
   set_fact:
     i3_keybindings: "{{ i3_keybindings_extra | list + i3_keybindings | list }}"
   when:
-   - i3_keybindings_extra is defined
-   - i3_keybindings is defined
+    - i3_keybindings_extra is defined
+    - i3_keybindings is defined
 
 - name: define extra i3 keybindings
   set_fact:
     i3_keybindings: "{{ i3_keybindings_extra | list }}"
   when:
-   - i3_keybindings_extra is defined
-   - i3_keybindings is not defined
+    - i3_keybindings_extra is defined
+    - i3_keybindings is not defined

tasks/versioncheck.yml

@@ -1,7 +1,7 @@
 ---
 - name: Create directory for versionscheck
   become: true
-  file:
+  ansible.builtin.file:
     path: '/etc/.ansible-version'
     state: directory
     mode: 0755
@@ -9,38 +9,38 @@
 
 - name: check playbook version
   become: true
-  slurp:
+  ansible.builtin.slurp:
     src: "/etc/.ansible-version/{{ playbook_version_path }}"
   register: playbook_version
   when: submodules_versioncheck|bool
-  ignore_errors: yes
+  ignore_errors: true
   failed_when: false
 
 - name: Print remote role version
-  debug:
+  ansible.builtin.debug:
     msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}"
   when: submodules_versioncheck|bool
 
 - name: Print locale role version
-  debug:
+  ansible.builtin.debug:
     msg: "Local role version: '{{ playbook_version_number|string }}'."
   when: submodules_versioncheck|bool
 
 - name: Check if your version is outdated
-  fail:
+  ansible.builtin.fail:
     msg: "Your ansible module has the version '{{ playbook_version_number }}' and is outdated. You need to update it!"
   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
-  find:
+  ansible.builtin.find:
     paths: '/etc/ansible-version/'
   register: filesFound
 
 - name: write new version to remote disk
   become: true
-  copy:
+  ansible.builtin.copy:
     content: "{{ playbook_version_number }}"
     dest: "/etc/.ansible-version/{{ playbook_version_path }}"
-    mode: 0644
+    mode: '0644'
   when: submodules_versioncheck|bool

templates/config.j2

@@ -178,7 +178,7 @@ exec xset -dpms
 exec compton
 
 {% if enable_lock_after_time | bool %}
-exec xautolock -time {{ lock_after_time }} -locker 'scrot /tmp/screen_locked.png; mogrify -scale 10% -scale 1000% /tmp/screen_locked.png; i3lock -i /tmp/screen_locked.png'
+exec xautolock -time {{ lock_after_time }} -locker 'maim /tmp/screen_locked.png; mogrify -scale 10% -scale 1000% /tmp/screen_locked.png; i3lock -i /tmp/screen_locked.png'
 {% endif %}
 
 # Start Default Applications

vars/Archlinux.yml

@@ -13,5 +13,5 @@ __i3_packages:
   - terminator
   - i3lock
   - xautolock
-  - scrot
+  - maim
   - imagemagick

vars/Debian.yml

@@ -8,5 +8,5 @@ __i3_packages:
   - terminator
   - i3lock
   - xautolock
-  - scrot
+  - maim
   - imagemagick

vars/Fedora.yml

@@ -8,5 +8,5 @@ __i3_packages:
   - i3lock
   - rofi
   - xautolock
-  - scrot
   - ImageMagick
+  - maim

vars/RedHat.yml

@@ -8,5 +8,5 @@ __i3_packages:
   - i3lock
   - dmenu
   - xautolock
-  - scrot
+  - maim
   - ImageMagick

vars/main.yml

@@ -33,5 +33,5 @@ __i3_workspaces:
 
 user: "{{ i3wm_user }}"
 
-playbook_version_number: 9015 # should be over ninethousand
+playbook_version_number: 9016  # should be int
 playbook_version_path: 'role-i3wm_chaos-bodensee_github.com.version'