diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index fec0e3d76..f90bea103 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -47,6 +47,18 @@ jobs: run: bash __tests__/verify-java.sh "11.0.10" "${{ steps.setup-java.outputs.path }}" shell: bash + - name: setup-java + uses: ./ + id: setup-java2 + with: + distribution: 'jdkfile' + jdkFile: ${{ runner.temp }}/${{ env.LocalFilename }} + java-version: '11.0.10' + architecture: x64 + - name: Verify Java version + run: bash __tests__/verify-java.sh "11.0.10" "${{ steps.setup-java2.outputs.path }}" + shell: bash + setup-java-local-file-zulu: name: Validate installation from local file Zulu runs-on: ${{ matrix.os }} @@ -81,4 +93,16 @@ jobs: architecture: x64 - name: Verify Java version run: bash __tests__/verify-java.sh "11.0" "${{ steps.setup-java.outputs.path }}" + shell: bash + + - name: setup-java + uses: ./ + id: setup-java2 + with: + distribution: 'jdkfile' + jdkFile: ${{ runner.temp }}/${{ env.LocalFilename }} + java-version: '11.0.0' + architecture: x64 + - name: Verify Java version + run: bash __tests__/verify-java.sh "11.0" "${{ steps.setup-java2.outputs.path }}" shell: bash \ No newline at end of file diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 29f85db3c..2ef346cb1 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -33,6 +33,16 @@ jobs: - name: Verify Java run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}" shell: bash + - name: setup-java + uses: ./ + id: setup-java2 + with: + java-version: ${{ matrix.version }} + java-package: 'jdk' + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" + shell: bash setup-java-major-minor-versions: @@ -69,6 +79,16 @@ jobs: - name: Verify Java run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}" shell: bash + - name: setup-java + uses: ./ + id: setup-java2 + with: + java-version: ${{ matrix.version }} + java-package: jdk + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" + shell: bash setup-java-ea-versions: name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} @@ -93,6 +113,16 @@ jobs: - name: Verify Java run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}" shell: bash + - name: setup-java + uses: ./ + id: setup-java2 + with: + java-version: ${{ matrix.version }} + java-package: jdk + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" + shell: bash setup-java-custom-package-type: name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }} @@ -139,6 +169,16 @@ jobs: - name: Verify Java run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}" shell: bash + - name: setup-java + uses: ./ + id: setup-java2 + with: + java-version: ${{ matrix.version }} + java-package: ${{ matrix.java-package }} + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" + shell: bash setup-java-custom-architecture: name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x86) - ${{ matrix.os }} @@ -163,4 +203,15 @@ jobs: architecture: x86 - name: Verify Java run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}" + shell: bash + + - name: setup-java + uses: ./ + id: setup-java2 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.version }} + architecture: x86 + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" shell: bash \ No newline at end of file