Merge pull request #15385 from p-linnane/revert-sorbet-again

Revert "Merge pull request #15377 from carlocab/sorbet-runtime-take2"
Homebrew · May 8, 2023 · 3887829 · 3887829
2 parents b61d350 + 7c7ddd8
commit 3887829
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
@@ -884,30 +884,6 @@ then
   fi
 fi
 
-if [[ -n "${HOMEBREW_DEVELOPER}" || -n "${HOMEBREW_DEVELOPER_COMMAND}" ]]
-then
-  # Always run with Sorbet for Homebrew developers or Homebrew developer commands.
-  export HOMEBREW_SORBET_RUNTIME="1"
-fi
-
-# NO_SORBET_RUNTIME_COMMANDS are currently failing with Sorbet for homebrew/core.
-# TODO: fix this and remove this if block.
-if [[ -n "${HOMEBREW_SORBET_RUNTIME}" ]]
-then
-  NO_SORBET_RUNTIME_COMMANDS=(
-    audit
-    determine-test-runners
-    readall
-  )
-
-  if check-array-membership "${HOMEBREW_COMMAND}" "${NO_SORBET_RUNTIME_COMMANDS[@]}"
-  then
-    unset HOMEBREW_SORBET_RUNTIME
-  fi
-
-  unset NO_SORBET_RUNTIME_COMMANDS
-fi
-
 if [[ -n "${HOMEBREW_DEVELOPER_COMMAND}" && -z "${HOMEBREW_DEVELOPER}" ]]
 then
   if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]]

diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb
@@ -357,8 +357,7 @@ module EnvConfig
         boolean:     true,
       },
       HOMEBREW_SORBET_RUNTIME:                   {
-        description: "If set, enable runtime typechecking using Sorbet. " \
-                     "Set by default for HOMEBREW_DEVELOPER or when running developer commands.",
+        description: "If set, enable runtime typechecking using Sorbet.",
         boolean:     true,
       },
       HOMEBREW_SSH_CONFIG_PATH:                  {

diff --git a/docs/Manpage.md b/docs/Manpage.md
@@ -2277,7 +2277,7 @@ example, run `export HOMEBREW_NO_INSECURE_REDIRECT=1` rather than just
   <br>If set along with `HOMEBREW_DEVELOPER`, do not use bottles from older versions of macOS. This is useful in development on new macOS versions.
 
 - `HOMEBREW_SORBET_RUNTIME`
-  <br>If set, enable runtime typechecking using Sorbet. Set by default for HOMEBREW_DEVELOPER or when running developer commands.
+  <br>If set, enable runtime typechecking using Sorbet.
 
 - `HOMEBREW_SSH_CONFIG_PATH`
   <br>If set, Homebrew will use the given config file instead of `~/.ssh/config` when fetching `git` repos over `ssh`.

diff --git a/manpages/brew.1 b/manpages/brew.1
@@ -3357,7 +3357,7 @@ If set along with \fBHOMEBREW_DEVELOPER\fR, do not use bottles from older versio
 \fBHOMEBREW_SORBET_RUNTIME\fR
 .
 .br
-If set, enable runtime typechecking using Sorbet\. Set by default for HOMEBREW_DEVELOPER or when running developer commands\.
+If set, enable runtime typechecking using Sorbet\.
 .
 .TP
 \fBHOMEBREW_SSH_CONFIG_PATH\fR