From 5929575df82b80ac358786da730de823f958117e Mon Sep 17 00:00:00 2001
From: Livio Spring <livio.a@gmail.com>
Date: Mon, 25 Mar 2024 09:29:54 +0100
Subject: [PATCH] chore(workflow): fix homebrew update (#7630)

(cherry picked from commit 2bcc42c4cddc2d050e1674f28edd23e890d42fa6)
---
 .github/workflows/build.yml    |  2 +
 .github/workflows/homebrew.yml | 74 ----------------------------------
 .github/workflows/release.yml  |  9 ++++-
 3 files changed, 9 insertions(+), 76 deletions(-)
 delete mode 100644 .github/workflows/homebrew.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a6c83d384..ef688b136a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,6 +86,8 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     secrets:
       GCR_JSON_KEY_BASE64: ${{ secrets.GCR_JSON_KEY_BASE64 }}
+      APP_ID: ${{ secrets.APP_ID }}
+      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
     with:
       build_image_name: ${{ needs.container.outputs.build_image }}
       semantic_version: "19.0.2"
diff --git a/.github/workflows/homebrew.yml b/.github/workflows/homebrew.yml
deleted file mode 100644
index f84eb7bb00..0000000000
--- a/.github/workflows/homebrew.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: ZITADEL Update Homebrew Formula
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  homebrew-releaser:
-    runs-on: ubuntu-latest
-    name: homebrew-releaser
-    steps:
-      - name: Release my project to my Homebrew tap
-        uses: Justintime50/homebrew-releaser@v1
-        with:
-          # The name of the homebrew tap to publish your formula to as it appears on GitHub.
-          # Required - strings
-          homebrew_owner: zitadel
-          homebrew_tap: homebrew-tap
-
-          # The name of the folder in your homebrew tap where formula will be committed to.
-          # Default is shown - string
-          formula_folder: Formula
-
-          # The Personal Access Token (saved as a repo secret) that has `repo` permissions for the repo running the action AND Homebrew tap you want to release to.
-          # Required - string
-          github_token: ${{ secrets.CR_PAT }}
-
-          # Git author info used to commit to the homebrew tap.
-          # Defaults are shown - strings
-          commit_owner: homebrew-releaser
-          commit_email: homebrew-releaser@zitadel.com
-
-          # Custom dependencies in case other formulas are needed to build the current one.
-          # Optional - multiline string
-          depends_on: |
-            "go" => :optional
-            "git"
-
-          # Custom install command for your formula.
-          # Required - string
-          install: 'bin.install "zitadel"'
-
-          # Custom test command for your formula so you can run `brew test`.
-          # Optional - string
-          test: 'ystem "#{bin}/zitadel -v"'
-
-          # Allows you to set a custom download strategy. Note that you'll need
-          # to implement the strategy and add it to your tap repository.
-          # Example: https://docs.brew.sh/Formula-Cookbook#specifying-the-download-strategy-explicitly
-          # Optional - string
-        #   download_strategy: CurlDownloadStrategy
-
-          # Allows you to add a custom require_relative at the top of the formula template.
-          # Optional - string
-        #   custom_require: custom_download_strategy
-
-          # Adds URL and checksum targets for different OS and architecture pairs. Using this option assumes 
-          # a tar archive exists on your GitHub repo with the following URL pattern (this cannot be customized):
-          # https://github.com/{GITHUB_OWNER}/{REPO_NAME}/releases/download/{TAG}/{REPO_NAME}-{VERSION}-{OPERATING_SYSTEM}-{ARCHITECTURE}.tar.gz'
-          # Darwin AMD pre-existing path example: https://github.com/justintime50/myrepo/releases/download/v1.2.0/myrepo-1.2.0-darwin-amd64.tar.gz
-          # Linux ARM pre-existing path example: https://github.com/justintime50/myrepo/releases/download/v1.2.0/myrepo-1.2.0-linux-arm64.tar.gz
-          # Optional - booleans
-          target_darwin_amd64: true
-          target_darwin_arm64: true
-          target_linux_amd64: true
-          target_linux_arm64: true
-
-          # Skips committing the generated formula to a homebrew tap (useful for local testing).
-          # Default is shown - boolean
-          skip_commit: true
-
-          # Logs debugging info to console.
-          # Default is shown - boolean
-          debug: true
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d9cef67fd..063623b3d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,6 +19,12 @@ on:
       GCR_JSON_KEY_BASE64:
         description: 'base64 endcrypted key to connect to Google'
         required: true
+      APP_ID:
+        description: 'GH App ID to request token for homebrew update'
+        required: true
+      APP_PRIVATE_KEY:
+        description: 'GH App Private Key to request token for homebrew update'
+        required: true
 
 jobs:
   version:
@@ -87,10 +93,9 @@ jobs:
         app_id: ${{ secrets.APP_ID }}
         private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Trigger Homebrew
-      if: ${{ github.ref_name == 'next' }}
       env:
         VERSION: ${{ needs.version.outputs.version }}
         RUN_ID: ${{ github.run_id }}
         GH_TOKEN: ${{ steps.generate-token.outputs.token }}
       run: |
-        gh workflow run -R zitadel/homebrew-tap update.yml -f runId=${RUN_ID} -f version=${VERSION}
+        gh workflow -R zitadel/homebrew-tap run update.yml -f runId=${RUN_ID} -f version=${VERSION}