From 7e07f66e478ecbda18e6895978e3939ba6226cdc Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 17 May 2022 00:09:10 +0100
Subject: [PATCH] Use sorbet-static-and-runtime

---
 .github/dependabot.yml            |  2 --
 .github/workflows/vendor-gems.yml | 14 +-------------
 Library/Homebrew/Gemfile          |  3 +--
 Library/Homebrew/Gemfile.lock     |  6 ++++--
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4369823297..4058b3e79f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,6 +16,4 @@ updates:
       interval: daily
     allow:
       - dependency-type: all
-    ignore:
-      - dependency-name: sorbet-runtime
     versioning-strategy: lockfile-only
diff --git a/.github/workflows/vendor-gems.yml b/.github/workflows/vendor-gems.yml
index c1b6fb3b97..38e84d001a 100644
--- a/.github/workflows/vendor-gems.yml
+++ b/.github/workflows/vendor-gems.yml
@@ -44,25 +44,13 @@ jobs:
 
           branch="$(git branch --show-current)"
           echo "::set-output name=branch::${branch}"
-
-          gem_name="$(echo "${branch}" | sed -E 's|.*/||;s|(.*)-.*$|\1|')"
-          echo "::set-output name=gem_name::${gem_name}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Vendor Gems
         env:
-          GEM_NAME: ${{ steps.checkout.outputs.gem_name }}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
-        run: |
-          set -u
-
-          if [[ "${GEM_NAME}" == 'sorbet' ]]
-          then
-            brew vendor-gems --update sorbet,sorbet-runtime
-          else
-            brew vendor-gems
-          fi
+        run: brew vendor-gems
 
       - name: Update RBI files
         env:
diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile
index e644c41c96..8361013733 100644
--- a/Library/Homebrew/Gemfile
+++ b/Library/Homebrew/Gemfile
@@ -27,8 +27,7 @@ gem "warning", require: false
 group :sorbet, optional: true do
   gem "parlour", require: false
   gem "rspec-sorbet", require: false
-  gem "sorbet", require: false
-  gem "sorbet-runtime", require: false
+  gem "sorbet-static-and-runtime", require: false
   gem "tapioca", require: false
 end
 
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index df52b3f7bb..26352d6ac8 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -162,6 +162,9 @@ GEM
     sorbet-runtime (0.5.10010)
     sorbet-runtime-stub (0.2.0)
     sorbet-static (0.5.10010-universal-darwin-14)
+    sorbet-static-and-runtime (0.5.10010)
+      sorbet (= 0.5.10010)
+      sorbet-runtime (= 0.5.10010)
     spoom (1.1.11)
       sorbet (>= 0.5.9204)
       sorbet-runtime (>= 0.5.9204)
@@ -229,9 +232,8 @@ DEPENDENCIES
   ruby-macho
   simplecov
   simplecov-cobertura
-  sorbet
-  sorbet-runtime
   sorbet-runtime-stub
+  sorbet-static-and-runtime
   tapioca
   warning