Reduce CI job matrix job count (#27660)
This commit is contained in:
		
							parent
							
								
									5d9e71ebe0
								
							
						
					
					
						commit
						9d799d40ba
					
				
							
								
								
									
										8
									
								
								.github/workflows/test-ruby.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/test-ruby.yml
									
									
									
									
										vendored
									
									
								
							| @ -105,7 +105,6 @@ jobs: | |||||||
|       SAML_ENABLED: true |       SAML_ENABLED: true | ||||||
|       CAS_ENABLED: true |       CAS_ENABLED: true | ||||||
|       BUNDLE_WITH: 'pam_authentication test' |       BUNDLE_WITH: 'pam_authentication test' | ||||||
|       CI_JOBS: ${{ matrix.ci_job }}/4 |  | ||||||
|       GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }} |       GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }} | ||||||
| 
 | 
 | ||||||
|     strategy: |     strategy: | ||||||
| @ -115,11 +114,6 @@ jobs: | |||||||
|           - '3.0' |           - '3.0' | ||||||
|           - '3.1' |           - '3.1' | ||||||
|           - '.ruby-version' |           - '.ruby-version' | ||||||
|         ci_job: |  | ||||||
|           - 1 |  | ||||||
|           - 2 |  | ||||||
|           - 3 |  | ||||||
|           - 4 |  | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v4 |       - uses: actions/checkout@v4 | ||||||
| 
 | 
 | ||||||
| @ -141,7 +135,7 @@ jobs: | |||||||
|       - name: Load database schema |       - name: Load database schema | ||||||
|         run: './bin/rails db:create db:schema:load db:seed' |         run: './bin/rails db:create db:schema:load db:seed' | ||||||
| 
 | 
 | ||||||
|       - run: bundle exec rake rspec_chunked |       - run: bin/rspec | ||||||
| 
 | 
 | ||||||
|   test-e2e: |   test-e2e: | ||||||
|     name: End to End testing |     name: End to End testing | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Gemfile
									
									
									
									
									
								
							| @ -103,9 +103,6 @@ gem 'rdf-normalize', '~> 0.5' | |||||||
| gem 'private_address_check', '~> 0.5' | gem 'private_address_check', '~> 0.5' | ||||||
| 
 | 
 | ||||||
| group :test do | group :test do | ||||||
|   # Used to split testing into chunks in CI |  | ||||||
|   gem 'rspec_chunked', '~> 0.6' |  | ||||||
| 
 |  | ||||||
|   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab |   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab | ||||||
|   gem 'rspec-github', '~> 2.4', require: false |   gem 'rspec-github', '~> 2.4', require: false | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -648,7 +648,6 @@ GEM | |||||||
|       rspec-mocks (~> 3.0) |       rspec-mocks (~> 3.0) | ||||||
|       sidekiq (>= 5, < 8) |       sidekiq (>= 5, < 8) | ||||||
|     rspec-support (3.12.1) |     rspec-support (3.12.1) | ||||||
|     rspec_chunked (0.6) |  | ||||||
|     rubocop (1.57.1) |     rubocop (1.57.1) | ||||||
|       base64 (~> 0.1.1) |       base64 (~> 0.1.1) | ||||||
|       json (~> 2.3) |       json (~> 2.3) | ||||||
| @ -919,7 +918,6 @@ DEPENDENCIES | |||||||
|   rspec-github (~> 2.4) |   rspec-github (~> 2.4) | ||||||
|   rspec-rails (~> 6.0) |   rspec-rails (~> 6.0) | ||||||
|   rspec-sidekiq (~> 4.0) |   rspec-sidekiq (~> 4.0) | ||||||
|   rspec_chunked (~> 0.6) |  | ||||||
|   rubocop |   rubocop | ||||||
|   rubocop-capybara |   rubocop-capybara | ||||||
|   rubocop-performance |   rubocop-performance | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user