mirror of
				https://github.com/actions/setup-java.git
				synced 2025-11-04 00:10:54 +00:00 
			
		
		
		
	Add microsoft distribution of the JDK.
This commit is contained in:
		
					parent
					
						
							
								5f00602cd1
							
						
					
				
			
			
				commit
				
					
						1bc25281d6
					
				
			
		
					 8 changed files with 26593 additions and 23332 deletions
				
			
		
							
								
								
									
										16
									
								
								.github/workflows/e2e-versions.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								.github/workflows/e2e-versions.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -14,13 +14,14 @@ on:
 | 
			
		|||
  workflow_dispatch:
 | 
			
		||||
jobs:
 | 
			
		||||
  setup-java-major-versions:
 | 
			
		||||
    if: ${{ matrix.distribution != 'microsoft' || matrix.version != '8' }}
 | 
			
		||||
    name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
 | 
			
		||||
    runs-on: ${{ matrix.os }}
 | 
			
		||||
    strategy:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
      matrix:
 | 
			
		||||
        os: [macos-latest, windows-latest, ubuntu-latest]
 | 
			
		||||
        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica'] # internally 'adopt-hotspot' is the same as 'adopt'
 | 
			
		||||
        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica', 'microsoft' ] # internally 'adopt-hotspot' is the same as 'adopt'
 | 
			
		||||
        version: ['8', '11', '16']
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout
 | 
			
		||||
| 
						 | 
				
			
			@ -175,16 +176,25 @@ jobs:
 | 
			
		|||
        shell: bash
 | 
			
		||||
 | 
			
		||||
  setup-java-custom-architecture:
 | 
			
		||||
    name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x86) - ${{ matrix.os }}
 | 
			
		||||
    # Only Zulu provides x86 arch for now and only for windows / ubuntu
 | 
			
		||||
    # Only Microsoft provides arm64 for windows / ubuntu / os x
 | 
			
		||||
    if: ${{ (matrix.distribution == 'zulu' && matrix.architecture == 'x86' && matrix.os != 'macos-latest' ) || (matrix.distribution == 'microsoft' && matrix.architecture == 'arm64') }}
 | 
			
		||||
    name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ matrix.architecture }}) - ${{ matrix.os }}
 | 
			
		||||
    needs: setup-java-major-minor-versions
 | 
			
		||||
    runs-on: ${{ matrix.os }}
 | 
			
		||||
    strategy:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
      matrix:
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
        # Only Zulu and Liberica provides x86 arch for now and only for windows / ubuntu
 | 
			
		||||
        os: [windows-latest, ubuntu-latest]
 | 
			
		||||
        distribution: ['zulu', 'liberica']
 | 
			
		||||
=======
 | 
			
		||||
        os: [macos-latest, windows-latest, ubuntu-latest]
 | 
			
		||||
        distribution: ['zulu', 'microsoft']
 | 
			
		||||
>>>>>>> Add microsoft distribution of the JDK.
 | 
			
		||||
        version: ['11']
 | 
			
		||||
        architecture: [ 'x86', 'arm64' ]
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout
 | 
			
		||||
        uses: actions/checkout@v2
 | 
			
		||||
| 
						 | 
				
			
			@ -194,7 +204,7 @@ jobs:
 | 
			
		|||
        with:
 | 
			
		||||
          distribution: ${{ matrix.distribution }}
 | 
			
		||||
          java-version: ${{ matrix.version }}
 | 
			
		||||
          architecture: x86
 | 
			
		||||
          architecture: ${{ matrix.architecture }}
 | 
			
		||||
      - name: Verify Java
 | 
			
		||||
        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
 | 
			
		||||
        shell: bash
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue