From 3688d512220a95f005f5835a0a7ae921272946d1 Mon Sep 17 00:00:00 2001
From: augustuswm <gusmayo@gmail.com>
Date: Tue, 30 Sep 2025 11:33:23 -0500
Subject: [PATCH 1/3] Allow dendrite update workflow to update via cargo

---
 .github/workflows/update-dendrite.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-dendrite.yml b/.github/workflows/update-dendrite.yml
index 09c3b869fc3..9f40052b192 100644
--- a/.github/workflows/update-dendrite.yml
+++ b/.github/workflows/update-dendrite.yml
@@ -27,7 +27,6 @@ jobs:
       INT_BRANCH: dendrite-integration
       TARGET_BRANCH: main
     steps:
-
       # Checkout both the target and integration branches
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -45,6 +44,26 @@ jobs:
         run: |
           ./tools/update_dendrite.sh
 
+      - name: Extract new dendrite package version
+        run: |
+          COMMIT=$(cargo metadata | \
+            jq -r '.resolve.nodes[] | select(.id | startswith("git+https://github.com/oxidecomputer/dendrite?rev=")) | select(.id | contains("dpd-client")) | .id' | \
+            awk 'match($0, /\?rev=([^#]+)/) { print substr($0, RSTART + 5, RLENGTH - 5) }')
+
+          echo "version=${COMMIT}" >> $GITHUB_OUTPUT
+        id: updated
+
+      - name: Commit changes
+        run: |
+          . ./tools/reflector/helpers.sh
+
+          PATHS=("Cargo.toml" "Cargo.lock")
+          CHANGES=()
+          commit $TARGET_BRANCH $INT_BRANCH ${{ inputs.reflector_user_id }} PATHS CHANGES
+
+          echo "api=${CHANGES[0]}" >> $GITHUB_OUTPUT
+        id: committed
+
       - name: Update pull request
         env:
           GH_TOKEN: ${{ inputs.reflector_access_token }}

From 8a42892f1c2bdbf22e36fab45f4f954ac248d91c Mon Sep 17 00:00:00 2001
From: augustuswm <gusmayo@gmail.com>
Date: Tue, 30 Sep 2025 11:33:39 -0500
Subject: [PATCH 2/3] Use dendrite_version

---
 .github/workflows/update-dendrite.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/update-dendrite.yml b/.github/workflows/update-dendrite.yml
index 9f40052b192..43b2c79ab15 100644
--- a/.github/workflows/update-dendrite.yml
+++ b/.github/workflows/update-dendrite.yml
@@ -43,21 +43,17 @@ jobs:
       - name: Update dendrite versions
         run: |
           ./tools/update_dendrite.sh
-
-      - name: Extract new dendrite package version
-        run: |
-          COMMIT=$(cargo metadata | \
-            jq -r '.resolve.nodes[] | select(.id | startswith("git+https://github.com/oxidecomputer/dendrite?rev=")) | select(.id | contains("dpd-client")) | .id' | \
-            awk 'match($0, /\?rev=([^#]+)/) { print substr($0, RSTART + 5, RLENGTH - 5) }')
-
-          echo "version=${COMMIT}" >> $GITHUB_OUTPUT
-        id: updated
+          - name: Extract new dendrite package version
+            run: |
+              eval $(cat tools/dendrite_version | grep COMMIT)
+              echo "version=${COMMIT:0:7}" >> $GITHUB_OUTPUT
+            id: updated
 
       - name: Commit changes
         run: |
           . ./tools/reflector/helpers.sh
 
-          PATHS=("Cargo.toml" "Cargo.lock")
+          PATHS=("tools/dendrite_version" "Cargo.toml" "Cargo.lock")
           CHANGES=()
           commit $TARGET_BRANCH $INT_BRANCH ${{ inputs.reflector_user_id }} PATHS CHANGES
 

From 33e361f91af34a8777bae7201ece26b705c2a7cd Mon Sep 17 00:00:00 2001
From: augustuswm <gusmayo@gmail.com>
Date: Tue, 30 Sep 2025 11:36:00 -0500
Subject: [PATCH 3/3] Fmt fail

---
 .github/workflows/update-dendrite.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update-dendrite.yml b/.github/workflows/update-dendrite.yml
index 43b2c79ab15..ffcc2146455 100644
--- a/.github/workflows/update-dendrite.yml
+++ b/.github/workflows/update-dendrite.yml
@@ -43,11 +43,12 @@ jobs:
       - name: Update dendrite versions
         run: |
           ./tools/update_dendrite.sh
-          - name: Extract new dendrite package version
-            run: |
-              eval $(cat tools/dendrite_version | grep COMMIT)
-              echo "version=${COMMIT:0:7}" >> $GITHUB_OUTPUT
-            id: updated
+
+      - name: Extract new dendrite package version
+        run: |
+          eval $(cat tools/dendrite_version | grep COMMIT)
+          echo "version=${COMMIT:0:7}" >> $GITHUB_OUTPUT
+        id: updated
 
       - name: Commit changes
         run: |