From ef2a576ebe1759da6965365829ba93f08399bc95 Mon Sep 17 00:00:00 2001
From: KC Berg <kc.berg@stackhawk.com>
Date: Wed, 9 Jul 2025 04:25:09 -0600
Subject: [PATCH] ci: update workflows with latest troubleshooting and fixes

---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/release.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d36a62..98f8090 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           git config user.email "${{ secrets.GH_DEPLOY_EMAIL }}"
       - name: Set up git for pushing
         run: |
-          git remote set-url origin https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://${{ secrets.GH_DEPLOY_USER }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
       - name: Show git user and remote
         run: |
           git config --get user.name
@@ -83,7 +83,7 @@ jobs:
           git config user.email "${{ secrets.GH_DEPLOY_EMAIL }}"
       - name: Set up git for pushing
         run: |
-          git remote set-url origin https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://${{ secrets.GH_DEPLOY_USER }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
       - name: Bump patch version with bumpver
         run: bumpver update --patch --commit
       - name: Push version bump commit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 246d0f0..85b425d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,7 +58,7 @@ jobs:
           pip install build bumpver
       - name: Set up git for pushing
         run: |
-          git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://${{ secrets.GH_DEPLOY_USER }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
       - name: Set git user for deploy
         run: |
           git config user.name "${{ secrets.GH_DEPLOY_USER }}"
@@ -86,7 +86,7 @@ jobs:
         shell: bash
       - name: Set up git for pushing
         run: |
-          git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://${{ secrets.GH_DEPLOY_USER }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx