From 611f0eb6f4f41811bbd35e9185321231caf6dc0a Mon Sep 17 00:00:00 2001
From: Ethan Rodkin <ethan@viam.com>
Date: Mon, 17 Nov 2025 13:50:17 -0500
Subject: [PATCH] merge before mucking around with headers

---
 .github/workflows/release.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ba69324..d7240ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -237,9 +237,19 @@ jobs:
           name: builds-${{ matrix.platform }}
           path: builds/*
 
-  create_canonical_header:
+  merge:
     needs: [build_macos, build_linux, build_windows]
     runs-on: ubuntu-latest
+    steps:
+      - name: Merge artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: builds
+          pattern: builds-*
+
+  create_canonical_header:
+    needs: [build_macos, build_linux, build_windows, merge]
+    runs-on: ubuntu-latest
     steps:
       # pick one arbitrarily as the canonical header file
       - name: create canonical header
@@ -268,16 +278,6 @@ jobs:
       - name: remove duplicate header
         run: rm builds/viam_rust_utils-${{ matrix.platform }}.h
 
-  merge:
-    needs: [build_macos, build_linux, build_windows, compare_headers]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Merge artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: builds
-          pattern: builds-*
-
   release:
     needs: [prepare, merge]
     if: github.repository_owner == 'viamrobotics'