From 958d2cae5af179b8b51e437dfa915d7350b1840f Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 22 Jun 2022 15:02:58 +0200
Subject: ci: Update Github workflows & add Dependabot

---
 .github/dependabot.yml                 |  8 ++++++++
 .github/workflows/integration_test.yml | 14 ++++++--------
 .github/workflows/shellcheck_test.yml  | 12 +++++-------
 .gitignore                             |  1 +
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..d4aa88fc
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    labels:
+      - 'type: dependencies'
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
index 0975a35c..5adfd04d 100644
--- a/.github/workflows/integration_test.yml
+++ b/.github/workflows/integration_test.yml
@@ -1,23 +1,21 @@
-# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
 name: Integration test
 on:
   push:
-    branches:
-      - master
+    branches: [ master ]
   pull_request:
-    branches:
-      - master
-      - rhel*-branch
+    branches: [ master, rhel*-branch ]
   release:
-    types: [published, created]
+    types: [ published, created ]
 
 jobs:
   buildCheck:
     runs-on: ubuntu-20.04
     steps:
       - name: Repository checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
       - name: Install dependencies
         run: sudo apt update && sudo apt install -y libpopt-dev gettext
+
       - name: Build & install
         run: make all && make install DESTDIR=/tmp/initscripts
diff --git a/.github/workflows/shellcheck_test.yml b/.github/workflows/shellcheck_test.yml
index bc5f3452..1235c4b7 100644
--- a/.github/workflows/shellcheck_test.yml
+++ b/.github/workflows/shellcheck_test.yml
@@ -1,9 +1,7 @@
 name: Differential ShellCheck
 on:
-  push:
-    branches: [master, rhel*-branch]
   pull_request:
-    branches: [master, rhel*-branch]
+    branches: [ master, rhel*-branch ]
 
 jobs:
   shellCheck:
@@ -11,13 +9,13 @@ jobs:
 
     steps:    
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}  
+          fetch-depth: 0 
       
       - name: Differential ShellCheck
-        uses: redhat-plumbers-in-action/differential-shellcheck@v1
+        uses: redhat-plumbers-in-action/differential-shellcheck@v2
         with:
           ignored-codes: .github/.diff-shellcheck-exceptions.txt
           shell-scripts: .github/.diff.shellcheck-scripts.txt
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 5a31cf56..6e01494a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ChangeLog
 *.tar.gz
+.vscode/
-- 
cgit v1.2.1