From 9c405ceb024b21b98c3487ba9080ff67f93d0a25 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 17 Nov 2022 14:38:01 +0100
Subject: [PATCH] ci: use shfmt fork

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .github/workflows/test-shellcheck.yml | 11 +++++++++++
 .github/workflows/test-shellfmt.yml   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-shellcheck.yml b/.github/workflows/test-shellcheck.yml
index d83c32d9a..874699c5b 100644
--- a/.github/workflows/test-shellcheck.yml
+++ b/.github/workflows/test-shellcheck.yml
@@ -23,8 +23,19 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
+      - name: Setup Go environment
+        uses: actions/setup-go@c4a742cab115ed795e34d4513e2cf7d472deb55f # tag=v3.3.1
+        with:
+          go-version: "1.19.3"
+
+      - name: Install shellfmt
+        shell: bash
+        run: |
+          go install github.com/katexochen/sh/v3/cmd/shfmt@latest
+
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@6d3f514f44620b9d4488e380339edc0d9bbe2fba # master
         with:
           severity: info
           ignore_paths: charts/cilium
+          additional_files: $(shfmt -f . | grep -v helm/charts/cilium)
diff --git a/.github/workflows/test-shellfmt.yml b/.github/workflows/test-shellfmt.yml
index 6da82e788..481658dd6 100644
--- a/.github/workflows/test-shellfmt.yml
+++ b/.github/workflows/test-shellfmt.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Install shellfmt
         shell: bash
         run: |
-          go install mvdan.cc/sh/v3/cmd/shfmt@latest
+          go install github.com/katexochen/sh/v3/cmd/shfmt@latest
 
       - name: Run shellfmt
         shell: bash