From 179d92a16d3dbe3f37b4f58af83b6135fbb7b08e Mon Sep 17 00:00:00 2001
From: Nils Wireklint <nils@meroton.com>
Date: Wed, 15 Nov 2023 11:24:09 +0100
Subject: [PATCH] CI: Move the buildifier check for whitespace last

---
 .github/workflows/pull-requests.yaml                | 8 ++++----
 tools/github_workflows/workflows_template.libsonnet | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
index 1d265bd..6b34577 100644
--- a/.github/workflows/pull-requests.yaml
+++ b/.github/workflows/pull-requests.yaml
@@ -23,10 +23,6 @@
                "name": "Gazelle",
                "run": "bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune && bazel run //:gazelle"
             },
-            {
-               "name": "Buildifier",
-               "run": "sed '/^$/d' go_dependencies.bzl > go_dependencies.bzl.new && mv go_dependencies.bzl.new go_dependencies.bzl && bazel run @com_github_bazelbuild_buildtools//:buildifier"
-            },
             {
                "name": "Gofmt",
                "run": "bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)"
@@ -94,6 +90,10 @@
             {
                "name": "windows_amd64: build and test",
                "run": "bazel build --platforms=@io_bazel_rules_go//go/toolchain:windows_amd64 //..."
+            },
+            {
+               "name": "Buildifier",
+               "run": "sed '/^$/d' go_dependencies.bzl > go_dependencies.bzl.new && mv go_dependencies.bzl.new go_dependencies.bzl && bazel run @com_github_bazelbuild_buildtools//:buildifier"
             }
          ]
       }
diff --git a/tools/github_workflows/workflows_template.libsonnet b/tools/github_workflows/workflows_template.libsonnet
index 5fb1d97..1463e5b 100644
--- a/tools/github_workflows/workflows_template.libsonnet
+++ b/tools/github_workflows/workflows_template.libsonnet
@@ -83,10 +83,6 @@
           name: 'Gazelle',
           run: 'bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune && bazel run //:gazelle',
         },
-        {
-          name: 'Buildifier',
-          run: "sed '/^$/d' go_dependencies.bzl > go_dependencies.bzl.new && mv go_dependencies.bzl.new go_dependencies.bzl && bazel run @com_github_bazelbuild_buildtools//:buildifier",
-        },
         {
           name: 'Gofmt',
           run: 'bazel run @cc_mvdan_gofumpt//:gofumpt -- -lang 1.19 -w -extra $(pwd)',
@@ -123,6 +119,10 @@
           name: 'Test docker-compose deployment',
           run: 'tools/test-deployment-docker-compose.sh',
         },
+        {
+          name: 'Buildifier',
+          run: "sed '/^$/d' go_dependencies.bzl > go_dependencies.bzl.new && mv go_dependencies.bzl.new go_dependencies.bzl && bazel run @com_github_bazelbuild_buildtools//:buildifier",
+        },
       ] + std.flattenArrays([
         [{
           name: platform.name + ': build and test',