From 78f82b972f85f65cfb3b15b9144ff724ce186443 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Wed, 28 Feb 2024 23:47:20 -0800
Subject: [PATCH] Sort publishing/rules.yaml

Needed because defaulter-gen tests end up depending on apimachinery.
---
 staging/publishing/rules.yaml | 65 ++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
index 4bd791e6ad4..68252583fef 100644
--- a/staging/publishing/rules.yaml
+++ b/staging/publishing/rules.yaml
@@ -1,35 +1,4 @@
 rules:
-- destination: code-generator
-  branches:
-  - name: master
-    source:
-      branch: master
-      dirs:
-      - staging/src/k8s.io/code-generator
-  - name: release-1.26
-    go: 1.21.7
-    source:
-      branch: release-1.26
-      dirs:
-      - staging/src/k8s.io/code-generator
-  - name: release-1.27
-    go: 1.21.7
-    source:
-      branch: release-1.27
-      dirs:
-      - staging/src/k8s.io/code-generator
-  - name: release-1.28
-    go: 1.21.7
-    source:
-      branch: release-1.28
-      dirs:
-      - staging/src/k8s.io/code-generator
-  - name: release-1.29
-    go: 1.21.7
-    source:
-      branch: release-1.29
-      dirs:
-      - staging/src/k8s.io/code-generator
 - destination: apimachinery
   branches:
   - name: master
@@ -186,6 +155,40 @@ rules:
       go build -mod=mod ./...
       go test -mod=mod ./...
   library: true
+- destination: code-generator
+  branches:
+  - name: master
+    source:
+      branch: master
+      dirs:
+      - staging/src/k8s.io/code-generator
+    dependencies:
+    - repository: apimachinery # for tests
+      branch: master
+  - name: release-1.26
+    go: 1.21.7
+    source:
+      branch: release-1.26
+      dirs:
+      - staging/src/k8s.io/code-generator
+  - name: release-1.27
+    go: 1.21.7
+    source:
+      branch: release-1.27
+      dirs:
+      - staging/src/k8s.io/code-generator
+  - name: release-1.28
+    go: 1.21.7
+    source:
+      branch: release-1.28
+      dirs:
+      - staging/src/k8s.io/code-generator
+  - name: release-1.29
+    go: 1.21.7
+    source:
+      branch: release-1.29
+      dirs:
+      - staging/src/k8s.io/code-generator
 - destination: component-base
   branches:
   - name: master