ci: use make fmt to check for formatting

Signed-off-by: Sunil Thaha <sthaha@redhat.com>
sustainable-computing-io · Oct 19, 2023 · bf6d2a3 · bf6d2a3
1 parent b1e0cfe
commit bf6d2a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 41 deletions.
diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
@@ -17,15 +17,17 @@ jobs:
           make docs
           git diff --exit-code
 
-  gofmt:
+  fmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
       - uses: actions/setup-go@main
         with:
           go-version-file: go.mod
-      - name: run gofmt test
-        run: ./automation/presubmit-tests/gofmt.sh
+      - name: Install all tools
+        uses: ./.github/tools-cache
+      - name: make fmt
+        run:  make fmt && git diff --exit-code
 
   escapes_detect:
     runs-on: ubuntu-latest
@@ -71,7 +73,7 @@ jobs:
         run: make govulncheck
 
   bundle:
-    needs: [docs, golangci, gofmt, vulnerability_detect, escapes_detect]
+    needs: [docs, golangci, fmt, vulnerability_detect, escapes_detect]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
@@ -87,7 +89,7 @@ jobs:
           git diff --exit-code
 
   build-images:
-    needs: [docs, golangci, gofmt, vulnerability_detect, escapes_detect]
+    needs: [docs, golangci, fmt, vulnerability_detect, escapes_detect]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -115,7 +117,7 @@ jobs:
           additional_tags: ${{ steps.additional_tags.outputs.result }}
 
   e2e:
-    needs: [docs, golangci, gofmt, vulnerability_detect, escapes_detect]
+    needs: [docs, golangci, fmt, vulnerability_detect, escapes_detect]
     env:
       KIND_VERSION: "0.15.0"
       GO111MODULE: "on"

diff --git a/automation/presubmit-tests/gofmt.sh b/automation/presubmit-tests/gofmt.sh