Merge branch 'master' into feature/allow_more_changes_auditd

Signed-off-by: Tim de Koning <[email protected]>

Author: tdekoning93

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
       - name: get the new tag
         id: new_tag
         run: echo "tag=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: get last tag information
@@ -90,7 +90,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.BOT_PAT }}
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
           name: CHANGELOG.md
@@ -153,7 +153,7 @@ jobs:
           ${{ secrets.SUPERMARKET_KEY }}
           EOF
       - name: checkout cookbook
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: cookbooks/${{ env.cookbook_name }}
           ref: ${{ needs.version-info.outputs.new_tag }}

.github/workflows/test.yml

@@ -9,16 +9,14 @@ on:
     branches:
       - '*'
   pull_request:
-    types:
-      - opened
     branches:
       - master
 
 jobs:
   cookstyle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
           path: |
@@ -30,7 +28,7 @@ jobs:
           curl -L https://omnitruck.cinc.sh/install.sh | sudo bash -s -- -P cinc-workstation -d .cache -v ${{ env.cinc_workstation_version }}
       - name: cookstyle
         run: |
-          cinc exec rake cookstyle
+          cinc exec cookstyle --fail-level r
 
   kitchen-dokken:
     runs-on: ubuntu-latest
@@ -56,10 +54,9 @@ jobs:
           - fedora-37
           - fedora-38
 #          - opensuse-42 # something is broken here
-          - ubuntu-18-04
           - ubuntu-20-04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
           path: |
@@ -93,13 +90,11 @@ jobs:
           - default-almalinux-9
           - default-rockylinux-8
           - default-rockylinux-9
-          - default-ubuntu-18-04
           - default-ubuntu-20-04
           - default-debian-10
           - default-debian-11
-          - default-fedora-38
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
           path: |

.kitchen.do.yml

@@ -47,12 +47,6 @@ platforms:
   lifecycle:
     post_create:
       - remote: sleep 10; while pgrep apt-get >/dev/null; do echo "Waiting for apt-get..."; sleep 5; done # let the installation of DO droplet-agent to finish and unlock dpkg
-- name: ubuntu-18-04
-  driver_config:
-    image: ubuntu-18-04-x64
-  lifecycle:
-    post_create:
-      - remote: sleep 10; while pgrep apt-get >/dev/null; do echo "Waiting for apt-get..."; sleep 5; done # let the installation of DO droplet-agent to finish and unlock dpkg
 - name: ubuntu-20-04
   driver_config:
     image: ubuntu-20-04-x64

.kitchen.dokken.yml

@@ -92,12 +92,6 @@ platforms:
   driver:
     image: dokken/opensuse-leap
     pid_one_command: /bin/systemd
-- name: ubuntu-18-04
-  driver:
-    image: dokken/ubuntu-18.04
-    pid_one_command: /bin/systemd
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update
 - name: ubuntu-20-04
   driver:
     image: dokken/ubuntu-20.04

.kitchen.yml

@@ -3,9 +3,6 @@ driver:
   name: vagrant
 
 platforms:
-- name: ubuntu-18-04
-  driver_config:
-    box: bento/ubuntu-18.04
 - name: ubuntu-20-04
   driver_config:
     box: bento/ubuntu-20.04