Merge pull request #9 from gripmock/relfix

fix formula

Author: rez1dent3

.github/workflows/homebrew.yaml

@@ -10,7 +10,6 @@ concurrency:
 permissions:
   contents: write
 env:
-  # Hardcoded deadline - do not change unless intentionally extending support
   FORMULA_DEADLINE: "2027-12-31"
 jobs:
   update-homebrew:
@@ -32,15 +31,18 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release download "${{ steps.version.outputs.TAG }}" --repo "${{ github.repository }}" --pattern "grpctestify-linux-amd64.tar.gz" --clobber
+          gh release download "${{ steps.version.outputs.TAG }}" --repo "${{ github.repository }}" --pattern "grpctestify-linux-arm64.tar.gz" --clobber
           gh release download "${{ steps.version.outputs.TAG }}" --repo "${{ github.repository }}" --pattern "grpctestify-macos-arm64.tar.gz" --clobber
           gh release download "${{ steps.version.outputs.TAG }}" --repo "${{ github.repository }}" --pattern "grpctestify-macos-amd64.tar.gz" --clobber
       - name: Calculate checksums
         id: checksum
         run: |
           LINUX_AMD64_CHECKSUM=$(sha256sum grpctestify-linux-amd64.tar.gz | awk '{print $1}')
+          LINUX_ARM64_CHECKSUM=$(sha256sum grpctestify-linux-arm64.tar.gz | awk '{print $1}')
           MACOS_ARM64_CHECKSUM=$(sha256sum grpctestify-macos-arm64.tar.gz | awk '{print $1}')
           MACOS_AMD64_CHECKSUM=$(sha256sum grpctestify-macos-amd64.tar.gz | awk '{print $1}')
           echo "LINUX_AMD64_CHECKSUM=$LINUX_AMD64_CHECKSUM" >> $GITHUB_OUTPUT
+          echo "LINUX_ARM64_CHECKSUM=$LINUX_ARM64_CHECKSUM" >> $GITHUB_OUTPUT
           echo "MACOS_ARM64_CHECKSUM=$MACOS_ARM64_CHECKSUM" >> $GITHUB_OUTPUT
           echo "MACOS_AMD64_CHECKSUM=$MACOS_AMD64_CHECKSUM" >> $GITHUB_OUTPUT
       - name: Clone tap repo
@@ -53,61 +55,128 @@ jobs:
         run: |
           VERSION="${{ steps.version.outputs.VERSION }}"
           LINUX_AMD64_CHECKSUM="${{ steps.checksum.outputs.LINUX_AMD64_CHECKSUM }}"
+          LINUX_ARM64_CHECKSUM="${{ steps.checksum.outputs.LINUX_ARM64_CHECKSUM }}"
           MACOS_ARM64_CHECKSUM="${{ steps.checksum.outputs.MACOS_ARM64_CHECKSUM }}"
           MACOS_AMD64_CHECKSUM="${{ steps.checksum.outputs.MACOS_AMD64_CHECKSUM }}"
           DEADLINE="${{ env.FORMULA_DEADLINE }}"
 
           cat > homebrew-tap/Formula/grpctestify.rb << EOF
-          # DEADLINE: ${DEADLINE} - Please migrate to cask
-          # brew install --cask grpctestify
-          #
-          # This formula is deprecated and will be removed after ${DEADLINE}
+          # typed: false
+          # frozen_string_literal: true
 
+          # This file was generated by GitHub Actions. DO NOT EDIT.
           class Grpctestify < Formula
-            desc "gRPC testing utility written in Rust (deprecated - use cask)"
+            desc "gRPC testing utility written in Rust"
             homepage "https://github.com/gripmock/grpctestify-rust"
-            url "https://github.com/gripmock/grpctestify-rust/releases/download/v${VERSION}/grpctestify-linux-amd64.tar.gz"
-            sha256 "${LINUX_AMD64_CHECKSUM}"
             version "${VERSION}"
             license "MIT"
-            deprecated! date: "${DEADLINE}", because: "use cask instead"
 
-            def install
-              bin.install "grpctestify"
+            on_macos do
+              if Hardware::CPU.intel?
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v${VERSION}/grpctestify-macos-amd64.tar.gz"
+                sha256 "${MACOS_AMD64_CHECKSUM}"
+
+                def install
+                  bin.install "grpctestify"
+                end
+              end
+
+              if Hardware::CPU.arm?
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v${VERSION}/grpctestify-macos-arm64.tar.gz"
+                sha256 "${MACOS_ARM64_CHECKSUM}"
+
+                def install
+                  bin.install "grpctestify"
+                end
+              end
+            end
+
+            on_linux do
+              if Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v${VERSION}/grpctestify-linux-amd64.tar.gz"
+                sha256 "${LINUX_AMD64_CHECKSUM}"
+
+                def install
+                  bin.install "grpctestify"
+                end
+              end
+
+              if Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v${VERSION}/grpctestify-linux-arm64.tar.gz"
+                sha256 "${LINUX_ARM64_CHECKSUM}"
+
+                def install
+                  bin.install "grpctestify"
+                end
+              end
+            end
+
+            deprecate! date: "${DEADLINE}", because: "moved to cask. Please run `brew install --cask grpctestify`"
+
+            def caveats
+              <<~EOS
+                The 'grpctestify' formula is deprecated and will be removed in future versions.
+                Please migrate to the cask version:
+                  brew uninstall grpctestify
+                  brew install --cask grpctestify
+              EOS
             end
 
             test do
-              assert_match "${VERSION}", shell_output("#{bin}/grpctestify --version")
+              assert_match "#{version}", shell_output("#{bin}/grpctestify --version")
             end
           end
           EOF
 
           cat > homebrew-tap/Casks/grpctestify.rb << EOF
+          # This file was generated by GitHub Actions. DO NOT EDIT.
           cask "grpctestify" do
-            arch arm: "arm64", intel: "amd64"
-
-            version "${VERSION}"
-            sha256 arm: "${MACOS_ARM64_CHECKSUM}", intel: "${MACOS_AMD64_CHECKSUM}"
-
-            url "https://github.com/gripmock/grpctestify-rust/releases/download/v#{version}/grpctestify-macos-#{arch}.tar.gz"
-            name "gRPCTestify"
+            name "grpctestify"
             desc "gRPC testing utility written in Rust"
             homepage "https://github.com/gripmock/grpctestify-rust"
+            version "${VERSION}"
 
-            binary "grpctestify", target: "grpctestify"
+            livecheck do
+              skip "Auto-generated on release."
+            end
 
-            postflight do
-              system_command "/usr/bin/xattr", args: ["-dr", "com.apple.quarantine", "#{HOMEBREW_PREFIX}/bin/grpctestify"], must_succeed: false
+            binary "grpctestify"
+
+            on_macos do
+              on_intel do
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v#{version}/grpctestify-macos-amd64.tar.gz",
+                  verified: "github.com/gripmock/grpctestify-rust"
+                sha256 "${MACOS_AMD64_CHECKSUM}"
+              end
+
+              on_arm do
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v#{version}/grpctestify-macos-arm64.tar.gz",
+                  verified: "github.com/gripmock/grpctestify-rust"
+                sha256 "${MACOS_ARM64_CHECKSUM}"
+              end
+            end
+
+            on_linux do
+              on_intel do
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v#{version}/grpctestify-linux-amd64.tar.gz",
+                  verified: "github.com/gripmock/grpctestify-rust"
+                sha256 "${LINUX_AMD64_CHECKSUM}"
+              end
+
+              on_arm do
+                url "https://github.com/gripmock/grpctestify-rust/releases/download/v#{version}/grpctestify-linux-arm64.tar.gz",
+                  verified: "github.com/gripmock/grpctestify-rust"
+                sha256 "${LINUX_ARM64_CHECKSUM}"
+              end
             end
 
-            caveats <<~EOS
-              If macOS still blocks launch, run:
-                xattr -dr com.apple.quarantine "$(brew --prefix)/bin/grpctestify"
-            EOS
+            postflight do
+              if OS.mac?
+                system_command "/usr/bin/xattr", args: ["-dr", "com.apple.quarantine", "#{staged_path}/grpctestify"]
+              end
+            end
 
-            zap trash: [
-              "~/.grpctestify",
-            ]
+            # No zap stanza required
           end
           EOF
       - name: Commit tap updates

Cargo.toml

@@ -2,7 +2,7 @@
 resolver = "2"
 
 [workspace.package]
-version = "1.3.5"
+version = "1.3.6"
 edition = "2024"
 authors = ["bavix"]
 license = "MIT"