Merge pull request #20769 from Homebrew/portable_ruby

Import and support Portable Ruby

Author: MikeMcQuaid

.github/workflows/tests.yml

@@ -109,17 +109,8 @@ jobs:
       - name: Run brew style on homebrew-core
         run: brew style homebrew/core
 
-      - name: Set up all Homebrew taps
-        run: |
-          brew tap homebrew/portable-ruby
-
-          # brew style doesn't like world writable directories
-          sudo chmod -R g-w,o-w "$(brew --repo)/Library/Taps"
-
-      - name: Run brew style on official taps
-        run: |
-          brew style homebrew/portable-ruby \
-                     homebrew/cask
+      - name: Run brew style on homebrew-cask
+        run: brew style homebrew/cask
 
   formula-audit:
     name: formula audit

Library/Homebrew/cmd/vendor-install.sh

@@ -12,7 +12,6 @@ source "${HOMEBREW_LIBRARY}/Homebrew/utils/ruby.sh"
 
 VENDOR_DIR="${HOMEBREW_LIBRARY}/Homebrew/vendor"
 
-# Built from https://github.com/Homebrew/homebrew-portable-ruby.
 set_ruby_variables() {
   # Handle the case where /usr/local/bin/brew is run under arm64.
   # It's a x86_64 installation there (we refuse to install arm64 binaries) so

Library/Homebrew/dev-cmd/portable-package.rb

@@ -0,0 +1,80 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "abstract_command"
+require "development_tools"
+require "dependency"
+
+module Homebrew
+  module Cmd
+    class PortablePackageCmd < AbstractCommand
+      cmd_args do
+        usage_banner <<~EOS
+          `portable-package` <formulae>
+
+          Build and package portable formulae.
+          For internal use in Homebrew taps.
+        EOS
+        switch "--no-uninstall-deps",
+               description: "Don't uninstall all dependencies of portable formulae before testing."
+        switch "-v", "--verbose",
+               description: "Pass `--verbose` to `brew` commands."
+        named_args :formula, min: 1
+
+        hide_from_man_page!
+      end
+
+      sig { override.void }
+      def run
+        ENV["HOMEBREW_DEVELOPER"] = "1"
+
+        verbose = []
+        verbose << "--verbose" if args.verbose?
+        verbose << "--debug" if args.debug?
+
+        # If test-bot cleanup is performed and auto-updates are disabled, this might not already be installed.
+        unless DevelopmentTools.ca_file_handles_most_https_certificates?
+          safe_system HOMEBREW_BREW_FILE, "install", "ca-certificates"
+        end
+
+        args.named.each do |name|
+          name = "portable-#{name}" unless name.start_with? "portable-"
+          begin
+            # On Linux, install glibc and linux-headers from bottles and don't install their build dependencies.
+            bottled_dep_allowlist = /\A(?:glibc|linux-headers)@/
+            deps = Dependency.expand(Formula[name], cache_key: "portable-package-#{name}") do |_dependent, dep|
+              Dependency.prune if dep.test? || dep.optional?
+
+              next unless bottled_dep_allowlist.match?(dep.name)
+
+              Dependency.keep_but_prune_recursive_deps
+            end.map(&:name)
+
+            bottled_deps, deps = deps.partition { |dep| bottled_dep_allowlist.match?(dep) }
+
+            safe_system HOMEBREW_BREW_FILE, "install", *verbose, *bottled_deps if bottled_deps.present?
+
+            # Build bottles for all other dependencies.
+            safe_system HOMEBREW_BREW_FILE, "install", "--build-bottle", *verbose, *deps
+
+            safe_system HOMEBREW_BREW_FILE, "install", "--build-bottle", *verbose, name
+            unless args.no_uninstall_deps?
+              safe_system HOMEBREW_BREW_FILE, "uninstall", "--force", "--ignore-dependencies", *verbose, *deps
+            end
+            safe_system HOMEBREW_BREW_FILE, "test", *verbose, name
+            puts "Linkage information:"
+            safe_system HOMEBREW_BREW_FILE, "linkage", *verbose, name
+            bottle_args = %w[
+              --skip-relocation
+              --json
+              --no-rebuild
+            ]
+            safe_system HOMEBREW_BREW_FILE, "bottle", *verbose, *bottle_args, name
+          rescue => e
+            ofail e
+          end
+        end
+      end
+    end
+  end
+end

Library/Homebrew/github_runner_matrix.rb

@@ -91,7 +91,7 @@ def active_runner_specs_hash
   def linux_runner_spec(arch)
     linux_runner = case arch
     when :arm64 then "ubuntu-22.04-arm"
-    when :x86_64 then ENV.fetch("HOMEBREW_LINUX_RUNNER")
+    when :x86_64 then ENV.fetch("HOMEBREW_LINUX_RUNNER", "ubuntu-latest")
     else raise "Unknown Linux architecture: #{arch}"
     end
 
@@ -150,6 +150,38 @@ def runner_enabled?(macos_version)
   def generate_runners!
     return if @runners.present?
 
+    # gracefully handle non-GitHub Actions environments
+    github_run_id = if ENV.key?("GITHUB_ACTIONS")
+      ENV.fetch("GITHUB_RUN_ID")
+    else
+      ENV.fetch("GITHUB_RUN_ID", "")
+    end
+
+    # Portable Ruby logic
+    if @testing_formulae.any? { |tf| tf.name.start_with?("portable-") }
+      @runners << create_runner(:linux, :x86_64)
+      @runners << create_runner(:linux, :arm64)
+
+      x86_64_spec = MacOSRunnerSpec.new(
+        name:    "macOS 10.15 x86_64",
+        runner:  "10.15-#{github_run_id}",
+        timeout: GITHUB_ACTIONS_LONG_TIMEOUT,
+        cleanup: true,
+      )
+      x86_64_macos_version = MacOSVersion.new("10.15")
+      @runners << create_runner(:macos, :x86_64, x86_64_spec, x86_64_macos_version)
+
+      arm64_spec = MacOSRunnerSpec.new(
+        name:    "macOS 11-arm64-cross",
+        runner:  "11-arm64-cross-#{github_run_id}",
+        timeout: GITHUB_ACTIONS_LONG_TIMEOUT,
+        cleanup: true,
+      )
+      arm64_macos_version = MacOSVersion.new("11")
+      @runners << create_runner(:macos, :arm64, arm64_spec, arm64_macos_version)
+      return
+    end
+
     if !@all_supported || ENV.key?("HOMEBREW_LINUX_RUNNER")
       @runners << create_runner(:linux, :x86_64)
 
@@ -159,13 +191,6 @@ def generate_runners!
       end
     end
 
-    # gracefully handle non-GitHub Actions environments
-    github_run_id = if ENV.key?("GITHUB_ACTIONS")
-      ENV.fetch("GITHUB_RUN_ID")
-    else
-      ENV.fetch("GITHUB_RUN_ID", "")
-    end
-
     long_timeout       = ENV.fetch("HOMEBREW_MACOS_LONG_TIMEOUT", "false") == "true"
     use_github_runner  = ENV.fetch("HOMEBREW_MACOS_BUILD_ON_GITHUB_RUNNER", "false") == "true"
 

Library/Homebrew/official_taps.rb

@@ -24,6 +24,7 @@
   livecheck
   nginx
   php
+  portable-ruby
   python
   science
   services

Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/portable_package_cmd.rbi

@@ -401,6 +401,11 @@ def formula!(formula_name, args:)
           return
         end
 
+        if tap&.core_tap? && formula.name.start_with?("portable-")
+          test "brew", "portable-package", formula_name
+          return
+        end
+
         test "brew", "deps", "--tree", "--annotate", "--include-build", "--include-test", named_args: formula_name
 
         deps_without_compatible_bottles = formula.deps.map(&:to_formula)

Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/test_bot_cmd.rbi

@@ -1952,6 +1952,24 @@ _brew_pin() {
   __brew_complete_installed_formulae
 }
 
+_brew_portable_package() {
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  case "${cur}" in
+    -*)
+      __brewcomp "
+      --debug
+      --help
+      --no-uninstall-deps
+      --quiet
+      --verbose
+      "
+      return
+      ;;
+    *) ;;
+  esac
+  __brew_complete_formulae
+}
+
 _brew_post_install() {
   local cur="${COMP_WORDS[COMP_CWORD]}"
   case "${cur}" in
@@ -3360,6 +3378,7 @@ _brew() {
     options) _brew_options ;;
     outdated) _brew_outdated ;;
     pin) _brew_pin ;;
+    portable-package) _brew_portable_package ;;
     post_install) _brew_post_install ;;
     postinstall) _brew_postinstall ;;
     pr-automerge) _brew_pr_automerge ;;

Library/Homebrew/test_bot/formulae.rb

@@ -1309,6 +1309,15 @@ __fish_brew_complete_arg 'pin' -l verbose -d 'Make some output more verbose'
 __fish_brew_complete_arg 'pin' -a '(__fish_brew_suggest_formulae_installed)'
 
 
+__fish_brew_complete_cmd 'portable-package' 'Build and package portable formulae'
+__fish_brew_complete_arg 'portable-package' -l debug -d 'Display any debugging information'
+__fish_brew_complete_arg 'portable-package' -l help -d 'Show this message'
+__fish_brew_complete_arg 'portable-package' -l no-uninstall-deps -d 'Don\'t uninstall all dependencies of portable formulae before testing'
+__fish_brew_complete_arg 'portable-package' -l quiet -d 'Make some output more quiet'
+__fish_brew_complete_arg 'portable-package' -l verbose -d 'Pass `--verbose` to `brew` commands'
+__fish_brew_complete_arg 'portable-package' -a '(__fish_brew_suggest_formulae_all)'
+
+
 __fish_brew_complete_cmd 'post_install' 'Rerun the post-install steps for formula'
 __fish_brew_complete_arg 'post_install' -l debug -d 'Display any debugging information'
 __fish_brew_complete_arg 'post_install' -l help -d 'Show this message'