From c3f1f9bba00b7da50fcb293daa6d9e3b6813d660 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Thu, 8 May 2025 14:21:34 +0100
Subject: [PATCH] ci: lets go back and see if old issues could be fixed with
 limiting the concurrency

---
 .forgejo/actions/update_branch/action.yml | 28 -------------
 .forgejo/workflows/geyser.yml             | 49 +++++++----------------
 2 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100644 .forgejo/actions/update_branch/action.yml

diff --git a/.forgejo/actions/update_branch/action.yml b/.forgejo/actions/update_branch/action.yml
deleted file mode 100644
index 4273335..0000000
--- a/.forgejo/actions/update_branch/action.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: 'Update_Geyser'
-description: 'Updates Geyser for a specified branch'
-inputs:
-  branch:  # id of input
-    description: 'what branch to update'
-    required: true
-    default: 'main'
-  token:  # id of input
-    description: 'Token needed to commit changes'
-    required: true
-runs:
-  using: "composite"
-  permissions:
-    # Give the default GITHUB_TOKEN write permission to commit and push the
-    # added or changed files to the repository.
-    contents: write
-  steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ inputs.branch }}
-        token: ${{ inputs.token }}
-    - run: nix run .#update_plugin -- update geyser
-      shell: bash
-    - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
-      with:
-        commit_message: "Updated geyser for ${{ inputs.branch }}"
-    - run: git checkout main
-      shell: bash
diff --git a/.forgejo/workflows/geyser.yml b/.forgejo/workflows/geyser.yml
index cf7a7d2..72f3322 100644
--- a/.forgejo/workflows/geyser.yml
+++ b/.forgejo/workflows/geyser.yml
@@ -1,26 +1,19 @@
 on:
   workflow_dispatch:
-
   schedule:
     - cron: '0 0 * * *'
 
-# using code from the nixos repo
 jobs:
-#  deploy_active:
-#    strategy:
-#      matrix:
-#        batch: [ active-core, active, active-ext ]
-#    runs-on: nix
-#    needs: [ deploy_dns ]
-#    steps:
-#      - uses: actions/checkout@v4
-#      - run: colmena apply -v --on @${{ matrix.batch }} --show-trace
-#        shell: bash
-
   update:
-#    strategy:
-#      matrix:
-#        branch: [ main, skynet, anime_manga ]
+
+    strategy:
+      max-parallel: 1
+      matrix:
+        branch:
+          - main
+          - skynet
+          - anime_manga
+          - games
     runs-on: nix
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the
@@ -30,24 +23,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-      - name: "main"
-        uses: ./.forgejo/actions/update_branch
-        with:
-          branch: "main"
+          ref: ${{ matrix.branch }}
           token: ${{ secrets.PIPELINE_TOKEN }}
-      - name: "skynet"
-        uses: ./.forgejo/actions/update_branch
+      - run: nix run .#update_plugin -- update geyser
+        shell: bash
+      - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
         with:
-          branch: "skynet"
-          token: ${{ secrets.PIPELINE_TOKEN }}
-      - name: "anime_manga"
-        uses: ./.forgejo/actions/update_branch
-        with:
-          branch: "anime_manga"
-          token: ${{ secrets.PIPELINE_TOKEN }}
-      - name: "games"
-        uses: ./.forgejo/actions/update_branch
-        with:
-          branch: "games"
-          token: ${{ secrets.PIPELINE_TOKEN }}
+          commit_message: "Updated geyser for ${{ matrix.branch }}"
\ No newline at end of file