From 30ca276a31f992f0d14b5224c084509c8f03eee2 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Fri, 2 Aug 2024 00:36:01 -0700
Subject: [PATCH] Update versions (#45)

---
 .github/workflows/publish.yml | 18 +++++++++++-------
 Formula/soroban-cli.rb        | 13 ++++++++-----
 Formula/stellar-xdr.rb        |  6 +++---
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 80f1afb..17f90d3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,7 +1,7 @@
 name: brew pr-pull
 
 on:
-  pull_request_target:
+  pull_request:
     types:
       - labeled
 
@@ -29,10 +29,14 @@ jobs:
         uses: Homebrew/actions/git-try-push@c62170a03ff2bcb9ab097fd7d6acbc905618e42a
         with:
           token: ${{ github.token }}
-          branch: main
+          branch: ${{ github.ref }}
 
-      - name: Delete branch
-        if: github.event.pull_request.head.repo.fork == false
-        env:
-          BRANCH: ${{ github.event.pull_request.head.ref }}
-        run: git push --delete origin "$BRANCH"
+      - name: Merge pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.pulls.merge({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+            })
diff --git a/Formula/soroban-cli.rb b/Formula/soroban-cli.rb
index 4eb229c..b7239f3 100644
--- a/Formula/soroban-cli.rb
+++ b/Formula/soroban-cli.rb
@@ -1,18 +1,21 @@
 class SorobanCli < Formula
-  desc "CLI for interacting with and deploying to Soroban"
+  desc "CLI for building for and interacting with the Stellar network"
   homepage "https://developers.stellar.org"
-  url "https://github.com/stellar/soroban-cli.git", tag: "v20.3.4"
-  head "https://github.com/stellar/soroban-cli.git", branch: "main"
+  url "https://github.com/stellar/stellar-cli.git", tag: "v21.2.0"
+  head "https://github.com/stellar/stellar-cli.git", branch: "main"
 
   depends_on "rust" => :build
+  depends_on "openssl@3"
 
   def install
     chdir "cmd/soroban-cli" do
-      system "cargo", "install", "--bin=soroban", *std_cargo_args
+      system "cargo", "install", "--bin=soroban", "--features=opt", *std_cargo_args
+      system "cargo", "install", "--bin=stellar", "--features=opt", *std_cargo_args
     end
   end
 
   test do
-    assert_match "soroban 20.3.4", shell_output("#{bin}/soroban version")
+    assert_match "stellar 21.2.0", shell_output("#{bin}/soroban version")
+    assert_match "stellar 21.2.0", shell_output("#{bin}/stellar version")
   end
 end
diff --git a/Formula/stellar-xdr.rb b/Formula/stellar-xdr.rb
index 24d2840..486af56 100644
--- a/Formula/stellar-xdr.rb
+++ b/Formula/stellar-xdr.rb
@@ -1,16 +1,16 @@
 class StellarXdr < Formula
   desc "CLI for encoding and decoding Stellar XDR"
   homepage "https://github.com/stellar/rs-stellar-xdr"
-  url "https://github.com/stellar/rs-stellar-xdr.git", tag: "v20.0.0"
+  url "https://github.com/stellar/rs-stellar-xdr.git", tag: "v21.2.0"
   head "https://github.com/stellar/rs-stellar-xdr.git", branch: "main"
 
   depends_on "rust" => :build
 
   def install
-    system "cargo", "install", "--features=cli", *std_cargo_args
+    system "cargo", "install", "--bin=stellar-xdr", "--features=cli", *std_cargo_args
   end
 
   test do
-    assert_match "stellar-xdr 20.0.0", shell_output("#{bin}/stellar-xdr version")
+    assert_match "stellar-xdr 21.2.0", shell_output("#{bin}/stellar-xdr version")
   end
 end