From 2879a2aa672bcfd2e36a42506f3414ba5c235bfc Mon Sep 17 00:00:00 2001
From: Alex Clarke <alex.j.tusa@gmail.com>
Date: Thu, 19 Dec 2024 17:53:16 -0700
Subject: [PATCH] ci: Corrected the scoop workflow to publish changes to repo
 first, and then to publish them to Scoop [skip ci]

---
 .../workflows/test-publish-scoop-bucket.yml   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-publish-scoop-bucket.yml b/.github/workflows/test-publish-scoop-bucket.yml
index c97fcc3..e7249d7 100644
--- a/.github/workflows/test-publish-scoop-bucket.yml
+++ b/.github/workflows/test-publish-scoop-bucket.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Install Scoop
         uses: MinoruSekine/setup-scoop@main
 
-      - name: Package and Publish package to Scoop
+      - name: Update and Publish Scoop Bucket
         run: |
           # Clean up previous version
           Remove-Item -Path './deployment/scoop/managarr.json' -ErrorAction SilentlyContinue
@@ -44,16 +44,15 @@ jobs:
           # Run packaging script
           python "./deployment/scoop/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/scoop/managarr.json.template" "./managarr.json" ${{ env.WINDOWS_SHA }}
 
+          # Persist the scoop bucket changes into repo
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add ./deployment/scoop/managarr.json
+          git commit -m "chore: Update Scoop bucket for version ${{ env.RELEASE_VERSION }} [skip ci]"
+          git push origin main
+
           # Publish to Scoop
           cd ./deployment/scoop/
-          scoop bucket add managarr-bucket https://github.com/Dark-Alex-17/deployment/scoop
+          scoop bucket add managarr-bucket https://github.com/Dark-Alex-17/managarr/tree/main/deployment/scoop
           scoop install managarr
           managarr --help
-
-          # Persist the scoop bucket changes into repo
-          # cd ../../
-          # git config user.name "github-actions[bot]"
-          # git config user.email "github-actions[bot]@users.noreply.github.com"
-          # git add ./deployment/scoop/managarr.json
-          # git commit -m "chore: Update Scoop bucket for version ${{ env.RELEASE_VERSION }} [skip ci]"
-          # git push origin main