diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 892ea9e94c..66583d51b3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -294,12 +294,12 @@ jobs: - name: tests (macOS 13) test-flags: --coverage runs-on: macos-13 - - name: tests (Ubuntu 22.04; Ruby 3.1) + - name: tests (Ubuntu 22.04; Ruby 2.6) runs-on: ubuntu-22.04 - ruby: '3.1' - - name: tests (macOS 13; Ruby 3.1) + ruby: '2.6' + - name: tests (macOS 13; Ruby 2.6) runs-on: macos-13 - ruby: '3.1' + ruby: '2.6' steps: - name: Set up Homebrew id: set-up-homebrew @@ -321,6 +321,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} + bundler: none - name: Setup Ruby environment if: matrix.ruby diff --git a/Dockerfile b/Dockerfile index 37c32aa98a..ec4dcc7d82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,8 @@ RUN apt-get update \ USER linuxbrew COPY --chown=linuxbrew:linuxbrew . /home/linuxbrew/.linuxbrew/Homebrew -ENV PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:${PATH}" +ENV PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:${PATH}" \ + HOMEBREW_RUBY3=1 WORKDIR /home/linuxbrew RUN mkdir -p \ diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 7fad5c9968..d847c60283 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -945,6 +945,11 @@ then export HOMEBREW_SORBET_RUNTIME="1" fi +if [[ -n "${HOMEBREW_DEVELOPER}" ]] +then + export HOMEBREW_RUBY3="1" +fi + if [[ -f "${HOMEBREW_LIBRARY}/Homebrew/cmd/${HOMEBREW_COMMAND}.sh" ]] then HOMEBREW_BASH_COMMAND="${HOMEBREW_LIBRARY}/Homebrew/cmd/${HOMEBREW_COMMAND}.sh" diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 322113501b..947fdd9cce 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -10,7 +10,7 @@ test_ruby() { return 1 fi - if [[ -n "${HOMEBREW_RUBY3}" ]] + if [[ -n "${HOMEBREW_RUBY3}" && -z "${HOMEBREW_USE_RUBY_FROM_PATH}" ]] then required_ruby_version="3.1.0" else