From 9f0af0f8ae22a37a2351b5d9a0ad8d7d93f85fb6 Mon Sep 17 00:00:00 2001
From: LizardByte-bot <108553330+LizardByte-bot@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:34:36 -0400
Subject: [PATCH] ci: update global workflows (#417)

---
 .github/workflows/automerge.yml |  4 ++--
 .github/workflows/yaml-lint.yml | 35 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 7ff83e0a..0ac82a7a 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Autoapproving
-        uses: hmarr/auto-approve-action@v2
+        uses: hmarr/auto-approve-action@v3
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Automerging
-        uses: pascalgn/automerge-action@v0.15.3
+        uses: pascalgn/automerge-action@v0.15.5
         env:
           BASE_BRANCHES: nightly
           GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
index f2e07218..5623c2dc 100644
--- a/.github/workflows/yaml-lint.yml
+++ b/.github/workflows/yaml-lint.yml
@@ -17,6 +17,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Find additional files
+        id: find-files
+        run: |
+          # space separated list of files
+          FILES=.clang-format
+
+          # empty placeholder
+          FOUND=""
+
+          for FILE in ${FILES}; do
+            if [ -f "$FILE" ]
+            then
+              FOUND="$FOUND $FILE"
+            fi
+          done
+
+          echo "found=${FOUND}" >> $GITHUB_OUTPUT
+
       - name: yaml lint
         id: yaml-lint
         uses: ibiqlik/action-yamllint@v3
@@ -30,17 +48,14 @@ jobs:
               line-length:
                 max: 120
               truthy:
-                allowed-values: ['true', 'false', 'on']  # GitHub uses "on" for workflow event triggers
+                # GitHub uses "on" for workflow event triggers
+                # .clang-format file has options of "Yes" "No" that will be caught by this, so changed to "warning"
+                allowed-values: ['true', 'false', 'on']
                 check-keys: true
-                level: error
+                level: warning
+          file_or_dir: . ${{ steps.find-files.outputs.found }}
 
       - name: Log
-        run: |
-          echo ${{ steps.yaml-lint.outputs.logfile }}
-
-      - name: Upload logs
-        uses: actions/upload-artifact@v3
         if: failure()
-        with:
-          name: yamllint-logfile
-          path: ${{ steps.yaml-lint.outputs.logfile }}
+        run: |
+          cat "${{ steps.yaml-lint.outputs.logfile }}" >> $GITHUB_STEP_SUMMARY