From 37713a69e7d77e84f6b0372b7f5d2db41e8e7522 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 2 Jun 2025 11:09:46 +0100
Subject: [PATCH] ci/update: cleanup how we get nixvim-ci's user-info

Get id, name, & email in a single `user-info` step.

(cherry picked from commit 2d60548ab1bd73490ab63f12aef16c4e4777b932)
---
 .github/workflows/update.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 48246f46..4124db4e 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -48,16 +48,27 @@ jobs:
           app-id: ${{ vars.CI_APP_ID }}
           private-key: ${{ secrets.CI_APP_PRIVATE_KEY }}
 
-      - name: Get GitHub App User ID
-        id: user-id
-        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+      - name: Get GitHub App user info
+        id: user-info
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          slug: ${{ steps.app-token.outputs.app-slug }}
+        run: |
+          name="$slug[bot]"
+          id=$(gh api "/users/$name" --jq .id)
+          {
+            echo "id=$id"
+            echo "name=$name"
+            echo "email=$id+$name@users.noreply.github.com"
+          } >> "$GITHUB_OUTPUT"
 
       - name: Configure git
+        env:
+          name: ${{ steps.user-info.outputs.name }}
+          email: ${{ steps.user-info.outputs.email }}
         run: |
-          git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]'
-          git config --global user.email '${{ steps.user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com'
+          git config --global user.name "$name"
+          git config --global user.email "$email"
 
       - name: Checkout repository
         uses: actions/checkout@v4