Change libvips to be enabled by default (#34741)
This commit is contained in:
		
							
								
								
									
										14
									
								
								.github/workflows/test-ruby.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/test-ruby.yml
									
									
									
									
										vendored
									
									
								
							@@ -143,7 +143,7 @@ jobs:
 | 
			
		||||
        uses: ./.github/actions/setup-ruby
 | 
			
		||||
        with:
 | 
			
		||||
          ruby-version: ${{ matrix.ruby-version}}
 | 
			
		||||
          additional-system-dependencies: ffmpeg imagemagick libpam-dev
 | 
			
		||||
          additional-system-dependencies: ffmpeg libpam-dev
 | 
			
		||||
 | 
			
		||||
      - name: Load database schema
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -173,8 +173,8 @@ jobs:
 | 
			
		||||
        env:
 | 
			
		||||
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 | 
			
		||||
 | 
			
		||||
  test-libvips:
 | 
			
		||||
    name: Libvips tests
 | 
			
		||||
  test-imagemagick:
 | 
			
		||||
    name: ImageMagick tests
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
 | 
			
		||||
    needs:
 | 
			
		||||
@@ -220,7 +220,7 @@ jobs:
 | 
			
		||||
      CAS_ENABLED: true
 | 
			
		||||
      BUNDLE_WITH: 'pam_authentication test'
 | 
			
		||||
      GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }}
 | 
			
		||||
      MASTODON_USE_LIBVIPS: true
 | 
			
		||||
      MASTODON_USE_LIBVIPS: false
 | 
			
		||||
 | 
			
		||||
    strategy:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
@@ -245,7 +245,7 @@ jobs:
 | 
			
		||||
        uses: ./.github/actions/setup-ruby
 | 
			
		||||
        with:
 | 
			
		||||
          ruby-version: ${{ matrix.ruby-version}}
 | 
			
		||||
          additional-system-dependencies: ffmpeg libpam-dev
 | 
			
		||||
          additional-system-dependencies: ffmpeg imagemagick libpam-dev
 | 
			
		||||
 | 
			
		||||
      - name: Load database schema
 | 
			
		||||
        run: './bin/rails db:create db:schema:load db:seed'
 | 
			
		||||
@@ -324,7 +324,7 @@ jobs:
 | 
			
		||||
        uses: ./.github/actions/setup-ruby
 | 
			
		||||
        with:
 | 
			
		||||
          ruby-version: ${{ matrix.ruby-version}}
 | 
			
		||||
          additional-system-dependencies: ffmpeg imagemagick
 | 
			
		||||
          additional-system-dependencies: ffmpeg
 | 
			
		||||
 | 
			
		||||
      - name: Set up Javascript environment
 | 
			
		||||
        uses: ./.github/actions/setup-javascript
 | 
			
		||||
@@ -443,7 +443,7 @@ jobs:
 | 
			
		||||
        uses: ./.github/actions/setup-ruby
 | 
			
		||||
        with:
 | 
			
		||||
          ruby-version: ${{ matrix.ruby-version}}
 | 
			
		||||
          additional-system-dependencies: ffmpeg imagemagick
 | 
			
		||||
          additional-system-dependencies: ffmpeg
 | 
			
		||||
 | 
			
		||||
      - name: Set up Javascript environment
 | 
			
		||||
        uses: ./.github/actions/setup-javascript
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user