Run tests against Java 17 (#515)
* Run tests against Java 17 * Fix tests on J17
This commit is contained in:
		
							parent
							
								
									e55763aca2
								
							
						
					
					
						commit
						5315d3c5b2
					
				
					 2 changed files with 8 additions and 8 deletions
				
			
		
							
								
								
									
										10
									
								
								.github/workflows/test-push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/test-push.yml
									
									
									
									
										vendored
									
									
								
							|  | @ -5,12 +5,10 @@ jobs: | ||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         gradle: [7.0.1] |         version: [7.0.0-jdk16, 7.2-jdk17] | ||||||
|         java: [jdk16] |  | ||||||
|         jvm: [hotspot] |  | ||||||
|     runs-on: ubuntu-20.04 |     runs-on: ubuntu-20.04 | ||||||
|     container: |     container: | ||||||
|       image: gradle:${{ matrix.gradle }}-${{ matrix.java }} |       image: gradle:${{ matrix.version }} | ||||||
|       options: --user root |       options: --user root | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  | @ -43,12 +41,12 @@ jobs: | ||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         java: [jdk16] |         version: [7.0.0-jdk16, 7.2-jdk17] | ||||||
|         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} |         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} | ||||||
| 
 | 
 | ||||||
|     runs-on: ubuntu-20.04 |     runs-on: ubuntu-20.04 | ||||||
|     container: |     container: | ||||||
|       image: gradle:7.0.0-${{ matrix.java }} |       image: gradle:${{ matrix.version }} | ||||||
|       options: --user root |       options: --user root | ||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|  |  | ||||||
|  | @ -24,9 +24,11 @@ | ||||||
| 
 | 
 | ||||||
| package net.fabricmc.loom.test | package net.fabricmc.loom.test | ||||||
| 
 | 
 | ||||||
|  | import org.gradle.util.GradleVersion | ||||||
|  | 
 | ||||||
| class LoomTestConstants { | class LoomTestConstants { | ||||||
|     public final static String DEFAULT_GRADLE = "7.0.1" |     public final static String DEFAULT_GRADLE = GradleVersion.current().getVersion() | ||||||
|     public final static String PRE_RELEASE_GRADLE = "7.4-20210929223033+0000" |     public final static String PRE_RELEASE_GRADLE = "7.4-20211007220130+0000" | ||||||
| 
 | 
 | ||||||
|     public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] |     public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue