diff --git a/.github/workflows/comment-command.yml b/.github/workflows/comment-command.yml
index 4e733374873..8e0115451e9 100644
--- a/.github/workflows/comment-command.yml
+++ b/.github/workflows/comment-command.yml
@@ -42,12 +42,24 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
+      - name: Set up Go 1.15.x
+        uses: actions/setup-go@v5
+        with:
+          cache: false
+          go-version: 1.15.x
+        id: go
+      - name: Install Buildifier
+        run: |
+          cd $(mktemp -d)
+          GO111MODULE=on go get github.com/bazelbuild/buildtools/buildifier@6.0.0
       - name: Install wpiformat
         run: pip3 install wpiformat==2024.45
       - name: Run wpiformat
         run: wpiformat
       - name: Run spotlessApply
         run: ./gradlew spotlessApply
+      - name: Run buildifier
+        run: buildifier -warnings all --lint=fix -r .
       - name: Commit
         run: |
           # Set credentials