From 860ba78650693a371d2a3f7b8b4cd8502ca59dea Mon Sep 17 00:00:00 2001
From: Zack Pollard <zackpollard@ymail.com>
Date: Fri, 30 Aug 2024 18:07:02 +0100
Subject: [PATCH] ci: fix release script (#12146)

---
 .github/workflows/prepare-release.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 6668976bcf..fc03b24d08 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -29,17 +29,6 @@ jobs:
       ref: ${{ steps.push-tag.outputs.commit_long_sha }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.ORG_RELEASE_TOKEN }}
-
-      - name: Install Poetry
-        run: pipx install poetry
-
-      - name: Bump version
-        run: misc/release/pump-version.sh -s "${{ inputs.serverBump }}" -m "${{ inputs.mobileBump }}"
-
       - name: Generate a token
         id: generate-token
         uses: actions/create-github-app-token@v1
@@ -47,6 +36,17 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+
+      - name: Install Poetry
+        run: pipx install poetry
+
+      - name: Bump version
+        run: misc/release/pump-version.sh -s "${{ inputs.serverBump }}" -m "${{ inputs.mobileBump }}"
+
       - name: Commit and tag
         id: push-tag
         uses: EndBug/add-and-commit@v9
@@ -55,7 +55,6 @@ jobs:
           message: 'chore: version ${{ env.IMMICH_VERSION }}'
           tag: ${{ env.IMMICH_VERSION }}
           push: true
-          github-token: ${{ steps.generate-token.outputs.token }}
 
   build_mobile:
     uses: ./.github/workflows/build-mobile.yml