Merge pull request #29 from spinel-coop/limit-setup-ruby

Only use setup-ruby if needed

Author: indirect

.github/workflows/build.yml

@@ -35,22 +35,25 @@ jobs:
 
       - name: Get version for setup-ruby
         run: |
-          VERSION=${{ inputs.formula }}
-          VERSION=${VERSION//rv-ruby}
-          VERSION=${VERSION//@}
-          echo VERSION=${VERSION} >> $GITHUB_ENV
+          SETUP_RUBY_VERSION=${{ inputs.formula }}
+          SETUP_RUBY_VERSION=${SETUP_RUBY_VERSION//rv-ruby}
+          SETUP_RUBY_VERSION=${SETUP_RUBY_VERSION//@}
+          if [[ "$SETUP_RUBY_VERSION" == "3.2."* ]]; then
+            echo SETUP_RUBY_VERSION=${SETUP_RUBY_VERSION} >> $GITHUB_ENV
+          fi
 
       # Static gem extensions typically require the same Ruby version available already
       - uses: ruby/setup-ruby@v1
         id: setup-ruby
-        if: ${{ inputs.formula != 'rv-ruby@0.49' && inputs.formula != 'rv-ruby-dev' }}
+        if: ${{ env.SETUP_RUBY_VERSION != '' }}
         with:
-          ruby-version: ${{ env.VERSION }}
+          ruby-version: ${{ env.SETUP_RUBY_VERSION }}
 
       - name: Install Homebrew
         run: |
           /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
           echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH
+          echo "/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 
       - name: Tap repo

Abstract/rv-ruby-32.rb

@@ -75,10 +75,12 @@ def self.inherited(subclass)
   end
 
  def install
-    # share RUSTUP_HOME across installs if provided
-    ENV["RUSTUP_HOME"] = ENV["HOMEBREW_RUSTUP_HOME"] if ENV.key?("HOMEBREW_RUSTUP_HOME")
-    # provide rustc for YJIT compilation
-    system "rustup install 1.58 --profile minimal" unless build.without? "yjit"
+    if build.with? "yjit"
+      # share RUSTUP_HOME across installs if provided
+      ENV["RUSTUP_HOME"] = ENV["HOMEBREW_RUSTUP_HOME"] if ENV.key?("HOMEBREW_RUSTUP_HOME")
+      ENV["RUSTUP_TOOLCHAIN"] = "1.58"
+      system "rustup install 1.58 --profile minimal" unless system("which rustc")
+    end
 
     bundled_gems = File.foreach("gems/bundled_gems").reject do |line|
       line.blank? || line.start_with?("#")

Abstract/rv-ruby-33.rb

@@ -74,10 +74,12 @@ def self.inherited(subclass)
   end
 
  def install
-    # share RUSTUP_HOME across installs if provided
-    ENV["RUSTUP_HOME"] = ENV["HOMEBREW_RUSTUP_HOME"] if ENV.key?("HOMEBREW_RUSTUP_HOME")
-    # provide rustc for YJIT compilation
-    system "rustup install 1.58 --profile minimal" unless build.without? "yjit"
+    if build.with? "yjit"
+      # share RUSTUP_HOME across installs if provided
+      ENV["RUSTUP_HOME"] = ENV["HOMEBREW_RUSTUP_HOME"] if ENV.key?("HOMEBREW_RUSTUP_HOME")
+      ENV["RUSTUP_TOOLCHAIN"] = "1.58"
+      system "rustup install 1.58 --profile minimal" unless system("which rustc")
+    end
 
     bundled_gems = File.foreach("gems/bundled_gems").reject do |line|
       line.blank? || line.start_with?("#")
@@ -108,8 +110,7 @@ def install
       if baseruby && baseruby_version =~ /#{Regexp.escape(version)}/
         args += %W[--with-baseruby=#{baseruby}]
       else
-        odie "HOMEBREW_BASERUBY must contain the path to a ruby #{version} executable, " \
-          "but instead contains #{baseruby}, with version #{baseruby_version}"
+        args += %W[--with-baseruby=#{RbConfig.ruby}]
       end
     end
 

Abstract/rv-ruby-34.rb

@@ -111,8 +111,7 @@ def install
     if baseruby && baseruby_allowed
       args += %W[--with-baseruby=#{baseruby}]
     else
-      odie "HOMEBREW_BASERUBY must contain the path to a ruby #{version} executable, " \
-        "but instead contains #{baseruby}, with version #{baseruby_version}"
+      args += %W[--with-baseruby=#{RbConfig.ruby}]
     end
 
     args += %W[--enable-yjit] unless build.without? "yjit"

bin/package

@@ -4,7 +4,7 @@ NUMBER="$1"
 
 export HOMEBREW_RUSTUP_HOME="$HOME/.rustup"
 
-if [[ "0.49" != "$NUMBER" && "dev" != "$NUMBER" ]]; then
+if [[ "$NUMBER" == "3.2."* ]]; then
   export HOMEBREW_BASERUBY="$HOME/.rubies/ruby-${NUMBER}/bin/ruby"
 fi