fix macos latest failures
This commit is contained in:
		
							parent
							
								
									a1c6c9c867
								
							
						
					
					
						commit
						2e4828dae1
					
				
							
								
								
									
										38
									
								
								.github/workflows/e2e-versions.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										38
									
								
								.github/workflows/e2e-versions.yml
									
									
									
									
										vendored
									
									
								
							| @ -20,7 +20,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-latest] |         os: [macos-13, windows-latest, ubuntu-latest] | ||||||
|         distribution: [ |         distribution: [ | ||||||
|             'temurin', |             'temurin', | ||||||
|             'adopt', |             'adopt', | ||||||
| @ -32,15 +32,15 @@ jobs: | |||||||
|             'corretto', |             'corretto', | ||||||
|             'dragonwell' |             'dragonwell' | ||||||
|           ] # internally 'adopt-hotspot' is the same as 'adopt' |           ] # internally 'adopt-hotspot' is the same as 'adopt' | ||||||
|         version: ['8', '11', '17'] |         version: ['21', '11', '17'] | ||||||
|         exclude: |         exclude: | ||||||
|           - distribution: microsoft |           - distribution: microsoft | ||||||
|             version: 8 |             version: 8 | ||||||
|           - distribution: dragonwell |           - distribution: dragonwell | ||||||
|             os: macos-latest |             os: macos-13 | ||||||
|         include: |         include: | ||||||
|           - distribution: oracle |           - distribution: oracle | ||||||
|             os: macos-latest |             os: macos-13 | ||||||
|             version: 17 |             version: 17 | ||||||
|           - distribution: oracle |           - distribution: oracle | ||||||
|             os: windows-latest |             os: windows-latest | ||||||
| @ -73,7 +73,7 @@ jobs: | |||||||
|         distribution: ['temurin', 'zulu', 'liberica'] |         distribution: ['temurin', 'zulu', 'liberica'] | ||||||
|         version: |         version: | ||||||
|           - '11.0' |           - '11.0' | ||||||
|           - '8.0.302' |           - '21.0' | ||||||
|           - '17.0.7+7' |           - '17.0.7+7' | ||||||
|         include: |         include: | ||||||
|           - distribution: oracle |           - distribution: oracle | ||||||
| @ -171,7 +171,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-latest] |         os: [macos-13, windows-latest, ubuntu-latest] | ||||||
|         version: ['17-ea', '15.0.0-ea.14'] |         version: ['17-ea', '15.0.0-ea.14'] | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout |       - name: Checkout | ||||||
| @ -215,22 +215,22 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-latest] |         os: [macos-13, windows-latest, ubuntu-latest] | ||||||
|         distribution: ['temurin', 'zulu', 'liberica', 'semeru'] |         distribution: ['temurin', 'zulu', 'liberica', 'semeru'] | ||||||
|         java-package: ['jre'] |         java-package: ['jre'] | ||||||
|         version: ['17.0'] |         version: ['17.0'] | ||||||
|         include: |         include: | ||||||
|           - distribution: 'zulu' |           - distribution: 'zulu' | ||||||
|             java-package: jre+fx |             java-package: jre+fx | ||||||
|             version: '8' |             version: '21' | ||||||
|             os: ubuntu-latest |             os: ubuntu-latest | ||||||
|           - distribution: 'zulu' |           - distribution: 'zulu' | ||||||
|             java-package: jdk+fx |             java-package: jdk+fx | ||||||
|             version: '8.0.242' |             version: '21.0' | ||||||
|             os: ubuntu-latest |             os: ubuntu-latest | ||||||
|           - distribution: 'liberica' |           - distribution: 'liberica' | ||||||
|             java-package: jdk+fx |             java-package: jdk+fx | ||||||
|             version: '8' |             version: '21' | ||||||
|             os: ubuntu-latest |             os: ubuntu-latest | ||||||
|           - distribution: 'liberica' |           - distribution: 'liberica' | ||||||
|             java-package: jre+fx |             java-package: jre+fx | ||||||
| @ -294,10 +294,10 @@ jobs: | |||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|       - name: Create .java-version file |       - name: Create .java-version file | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: echo "8" > .java-version |         run: echo "17" > .java-version | ||||||
|       - name: Create .tool-versions file |       - name: Create .tool-versions file | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: echo "java 8" > .tool-versions |         run: echo "java 17" > .tool-versions | ||||||
|       - name: setup-java |       - name: setup-java | ||||||
|         uses: ./ |         uses: ./ | ||||||
|         id: setup-java |         id: setup-java | ||||||
| @ -351,10 +351,10 @@ jobs: | |||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|       - name: Create .java-version file |       - name: Create .java-version file | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: echo "11.0.2" > .java-version |         run: echo "17.0.10" > .java-version | ||||||
|       - name: Create .tool-versions file |       - name: Create .tool-versions file | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: echo "java 11.0.2" > .tool-versions |         run: echo "java 17.0.10" > .tool-versions | ||||||
|       - name: setup-java |       - name: setup-java | ||||||
|         uses: ./ |         uses: ./ | ||||||
|         id: setup-java |         id: setup-java | ||||||
| @ -362,11 +362,11 @@ jobs: | |||||||
|           distribution: ${{ matrix.distribution }} |           distribution: ${{ matrix.distribution }} | ||||||
|           java-version-file: ${{matrix.java-version-file }} |           java-version-file: ${{matrix.java-version-file }} | ||||||
|       - name: Verify Java |       - name: Verify Java | ||||||
|         run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}" |         run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}" | ||||||
|         shell: bash |         shell: bash | ||||||
| 
 | 
 | ||||||
|   setup-java-version-from-file-major-minor-patch-with-dist: |   setup-java-version-from-file-major-minor-patch-with-dist: | ||||||
|     name: ${{ matrix.distribution }} version from file 'openjdk64-11.0.2' - ${{ matrix.os }} |     name: ${{ matrix.distribution }} version from file 'openjdk64-17.0.10' - ${{ matrix.os }} | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
| @ -379,10 +379,10 @@ jobs: | |||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|       - name: Create .java-version file |       - name: Create .java-version file | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: echo "openjdk64-11.0.2" > .java-version |         run: echo "openjdk64-17.0.10" > .java-version | ||||||
|       - name: Create .tool-versions file |       - name: Create .tool-versions file | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: echo "java openjdk64-11.0.2" > .tool-versions |         run: echo "java openjdk64-17.0.10" > .tool-versions | ||||||
|       - name: setup-java |       - name: setup-java | ||||||
|         uses: ./ |         uses: ./ | ||||||
|         id: setup-java |         id: setup-java | ||||||
| @ -390,5 +390,5 @@ jobs: | |||||||
|           distribution: ${{ matrix.distribution }} |           distribution: ${{ matrix.distribution }} | ||||||
|           java-version-file: ${{matrix.java-version-file }} |           java-version-file: ${{matrix.java-version-file }} | ||||||
|       - name: Verify Java |       - name: Verify Java | ||||||
|         run: bash __tests__/verify-java.sh "11.0.2" "${{ steps.setup-java.outputs.path }}" |         run: bash __tests__/verify-java.sh "17.0.10" "${{ steps.setup-java.outputs.path }}" | ||||||
|         shell: bash |         shell: bash | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user