Merge pull request #15368 from Homebrew/revert-15326-more_sorbet_runtime
Revert "Enable Sorbet by default for Homebrew developers and developer commands."
This commit is contained in:
		
						commit
						d2ea65a12b
					
				@ -850,9 +850,6 @@ if [[ -f "${HOMEBREW_LIBRARY}/Homebrew/dev-cmd/${HOMEBREW_COMMAND}.sh" ]] ||
 | 
				
			|||||||
then
 | 
					then
 | 
				
			||||||
  export HOMEBREW_DEVELOPER_COMMAND="1"
 | 
					  export HOMEBREW_DEVELOPER_COMMAND="1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Always run developer commands with Sorbet.
 | 
					 | 
				
			||||||
  export HOMEBREW_SORBET_RUNTIME="1"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" ]]
 | 
					  if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" ]]
 | 
				
			||||||
  then
 | 
					  then
 | 
				
			||||||
    NO_INSTALL_FROM_API_COMMANDS=(
 | 
					    NO_INSTALL_FROM_API_COMMANDS=(
 | 
				
			||||||
@ -886,14 +883,6 @@ then
 | 
				
			|||||||
  fi
 | 
					  fi
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# brew readall is currently failing with Sorbet for homebrew/core.
 | 
					 | 
				
			||||||
# TODO: fix this and remove this HOMEBREW_COMMAND conditional.
 | 
					 | 
				
			||||||
if [[ -n "${HOMEBREW_DEVELOPER}" && "${HOMEBREW_COMMAND}" != "readall" ]]
 | 
					 | 
				
			||||||
then
 | 
					 | 
				
			||||||
  # Always run with Sorbet for Homebrew developers.
 | 
					 | 
				
			||||||
  export HOMEBREW_SORBET_RUNTIME="1"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if [[ -n "${HOMEBREW_DEVELOPER_COMMAND}" && -z "${HOMEBREW_DEVELOPER}" ]]
 | 
					if [[ -n "${HOMEBREW_DEVELOPER_COMMAND}" && -z "${HOMEBREW_DEVELOPER}" ]]
 | 
				
			||||||
then
 | 
					then
 | 
				
			||||||
  if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]]
 | 
					  if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]]
 | 
				
			||||||
 | 
				
			|||||||
@ -357,8 +357,7 @@ module Homebrew
 | 
				
			|||||||
        boolean:     true,
 | 
					        boolean:     true,
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      HOMEBREW_SORBET_RUNTIME:                   {
 | 
					      HOMEBREW_SORBET_RUNTIME:                   {
 | 
				
			||||||
        description: "If set, enable runtime typechecking using Sorbet. " \
 | 
					        description: "If set, enable runtime typechecking using Sorbet.",
 | 
				
			||||||
                     "Set by default for HOMEBREW_DEVELOPER or when running developer commands.",
 | 
					 | 
				
			||||||
        boolean:     true,
 | 
					        boolean:     true,
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      HOMEBREW_SSH_CONFIG_PATH:                  {
 | 
					      HOMEBREW_SSH_CONFIG_PATH:                  {
 | 
				
			||||||
 | 
				
			|||||||
@ -2275,7 +2275,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.
 | 
					  <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`
 | 
					- `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`
 | 
					- `HOMEBREW_SSH_CONFIG_PATH`
 | 
				
			||||||
  <br>If set, Homebrew will use the given config file instead of `~/.ssh/config` when fetching `git` repos over `ssh`.
 | 
					  <br>If set, Homebrew will use the given config file instead of `~/.ssh/config` when fetching `git` repos over `ssh`.
 | 
				
			||||||
 | 
				
			|||||||
@ -3354,7 +3354,7 @@ If set along with \fBHOMEBREW_DEVELOPER\fR, do not use bottles from older versio
 | 
				
			|||||||
\fBHOMEBREW_SORBET_RUNTIME\fR
 | 
					\fBHOMEBREW_SORBET_RUNTIME\fR
 | 
				
			||||||
.
 | 
					.
 | 
				
			||||||
.br
 | 
					.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
 | 
					.TP
 | 
				
			||||||
\fBHOMEBREW_SSH_CONFIG_PATH\fR
 | 
					\fBHOMEBREW_SSH_CONFIG_PATH\fR
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user