Enable Ruby 3 for HOMEBREW_DEVELOPER
				
					
				
			This commit is contained in:
		
							parent
							
								
									6d65c4c679
								
							
						
					
					
						commit
						559336c771
					
				
							
								
								
									
										9
									
								
								.github/workflows/tests.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/tests.yml
									
									
									
									
										vendored
									
									
								
							@ -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
 | 
			
		||||
 | 
			
		||||
@ -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 \
 | 
			
		||||
 | 
			
		||||
@ -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"
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user