fix: remaining templates

garden-io · Sep 11, 2023 · f399f12 · f399f12
1 parent f003dad
commit f399f12
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/manually-create-homebrew-pr.yml b/.github/workflows/manually-create-homebrew-pr.yml
@@ -17,8 +17,6 @@ jobs:
     with:
       release-version: ${{ inputs.release-version }}
       commit-message: |
-        Bump {{formulaName}} to {{version}}.
-
         This PR has been generated by the "Manually release Garden to Homebrew" workflow.
         
         @${{ github.triggering_actor }} Please review this PR carefully and merge once Garden {{version}} should be released to Homebrew.

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -47,8 +47,6 @@ jobs:
       release-condition: ${{ github.event.release.prerelease != true }}
       release-version: ${{ github.event.release.tag_name }}
       commit-message: |
-        Bump {{formulaName}} to {{version}}.
-
         This PR has been generated by the publish-release workflow after the new release
 
         @${{ github.triggering_actor }} Please review this PR carefully and merge once Garden {{version}} should be released to Homebrew.

diff --git a/.github/workflows/reusable-create-homebrew-pr.yml b/.github/workflows/reusable-create-homebrew-pr.yml
@@ -14,8 +14,6 @@ on:
         type: string
         description: "Commit message for homebrew repository."
         default: |
-          Bump {{formulaName}} to {{version}}.
-
           For more info: https://github.com/garden-io/garden
 
 permissions:
@@ -78,7 +76,7 @@ jobs:
           output_file: homebrew-garden/Formula/garden-cli.rb
           strict: true
           variables: |
-            version=${{ inputs.release-version }}}
+            version=${{ inputs.release-version }}
             armTarballUrl=${{ needs.fetch-release-checksums.outputs.arm-tarball-url }}
             amdTarballUrl=${{ needs.fetch-release-checksums.outputs.amd-tarball-url }}
             armSha256=${{ needs.fetch-release-checksums.outputs.arm-sha256 }}
@@ -90,9 +88,15 @@ jobs:
         with:
           path: ${{ github.workspace }}/homebrew-garden
           token: ${{ secrets.COMMITTER_TOKEN }}
-          commit-message: ${{ inputs.commit-message }}
+          commit-message: |
+            Bump garden-cli.rb to ${{ inputs.release-version }}
+
+            ${{ inputs.commit-message }}
           title: Bump garden-cli to ${{ inputs.release-version }}
-          body: ${{ inputs.commit-message}}
+          body:  |
+            Bump garden-cli.rb to ${{ inputs.release-version }}
+
+            ${{ inputs.commit-message}}
           branch: garden-cli-${{ inputs.release-version }}
           reviewers: ${{ github.triggering_actor }}
 

diff --git a/.github/workflows/test-create-homebrew-pr.yml b/.github/workflows/test-create-homebrew-pr.yml
@@ -12,7 +12,7 @@ jobs:
   test:
     uses: ./.github/workflows/reusable-create-homebrew-pr.yml
     with:
-      release-version: edge
+      release-version: edge-bonsai
       commit-message: |
         This is just a test. DO NOT MERGE
 
@@ -27,7 +27,7 @@ jobs:
     uses: ./.github/workflows/reusable-create-homebrew-pr.yml
     with:
       release-condition: false
-      release-version: edge
+      release-version: edge-bonsai
       commit-message: |
         Do not merge. This PR should not exist.
 

diff --git a/support/homebrew-formula.rb.j2 b/support/homebrew-formula.rb.j2
@@ -4,6 +4,8 @@ class GardenCli < Formula
 
   version "{{version}}"
 
+  depends_on "rsync"
+
   # Determine architecture
   if Hardware::CPU.arm?
     url "{{armTarballUrl}}"
@@ -14,7 +16,7 @@ class GardenCli < Formula
   end
 
   def install
-    libexec.install "garden", "fsevents.node", "static", "pty.node"
+    libexec.install "garden", "fsevents.node", "static"
     bin.install_symlink libexec/"garden"
   end