From 260c5bc4cc738be032920a09ec99c95e1e35a071 Mon Sep 17 00:00:00 2001
From: Mat Jones <mat@mjones.network>
Date: Fri, 24 May 2024 09:23:20 -0400
Subject: [PATCH] fix(ci): Update existing flake.lock PR if it exists already

---
 .../workflows/update-flake-dependencies.yml   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/update-flake-dependencies.yml b/.github/workflows/update-flake-dependencies.yml
index 85fad658..b044e4e5 100644
--- a/.github/workflows/update-flake-dependencies.yml
+++ b/.github/workflows/update-flake-dependencies.yml
@@ -13,20 +13,28 @@ jobs:
     - uses: actions/checkout@v4
     - uses: DeterminateSystems/nix-installer-action@main
     - uses: DeterminateSystems/magic-nix-cache-action@main
-    - name: update flake.lock
-      run: nix flake update
-    - name: Create signed commit with flake.lock changes
+    - name: Update flake.lock and create signed commit with flake.lock changes
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         FILE_TO_COMMIT: flake.lock
         COMMIT_BRANCH: automation/update-flake-dependencies
         COMMIT_MESSAGE: "chore(nix): Update Flake dependencies"
       run: |
+          # fetch remote state
+          git fetch
+          # if branch exists on remote already
+          if git checkout "$COMMIT_BRANCH" > /dev/null 2>&1; then
+            # pull changes
+            git pull
+          else
+            # otherwise, create the branch and push it to remote
+            git checkout -b "$COMMIT_BRANCH"
+            git push -u origin "$COMMIT_BRANCH"
+          fi
+          # update flake.lock
+          nix flake update
           # make sure something actually changed first, if not, no updates required
           if [[ `git status --porcelain` ]]; then
-            # create the branch on the remote
-            git branch "$COMMIT_BRANCH"
-            git push -u origin "$COMMIT_BRANCH"
             # commit via the GitHub API so we get automatic commit signing
             gh api --method PUT /repos/1Password/shell-plugins/contents/$FILE_TO_COMMIT \
               --field message="$COMMIT_MESSAGE" \