From 940ea55eeebaa863e355df5bc6d11ac288fcaedf Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 4 Mar 2021 11:16:16 +0300 Subject: [PATCH 1/2] double check --- .github/workflows/e2e-local-file.yml | 24 +++++++++++++ .github/workflows/e2e-versions.yml | 51 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index fec0e3d76..58f451b86 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-java + 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-java.outputs.path }}" + shell: bash + setup-java-local-file-zulu: name: Validate installation from local file Zulu runs-on: ${{ matrix.os }} @@ -71,6 +83,18 @@ jobs: echo "LocalFilename=$localFilename" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append (New-Object System.Net.WebClient).DownloadFile($downloadUrl, "$env:RUNNER_TEMP/$localFilename") shell: pwsh + - name: setup-java + uses: ./ + id: setup-java + 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-java.outputs.path }}" + shell: bash + - name: setup-java uses: ./ id: setup-java diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 29f85db3c..d601b171c 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-java + with: + java-version: ${{ matrix.version }} + java-package: 'jdk' + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.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-java + with: + java-version: ${{ matrix.version }} + java-package: jdk + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.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-java + with: + java-version: ${{ matrix.version }} + java-package: jdk + distribution: ${{ matrix.distribution }} + - name: Verify Java + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.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-java + 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-java.outputs.path }}" + shell: bash setup-java-custom-architecture: name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x86) - ${{ matrix.os }} @@ -154,6 +194,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: setup-java + uses: ./ + id: setup-java + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.version }} + 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-java From df157814c9d12079496d19c1a8018834fcf65bd5 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 4 Mar 2021 11:22:35 +0300 Subject: [PATCH 2/2] fix id --- .github/workflows/e2e-local-file.yml | 8 ++++---- .github/workflows/e2e-versions.yml | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index 58f451b86..f90bea103 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -49,14 +49,14 @@ jobs: - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + run: bash __tests__/verify-java.sh "11.0.10" "${{ steps.setup-java2.outputs.path }}" shell: bash setup-java-local-file-zulu: @@ -97,12 +97,12 @@ jobs: - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + 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 d601b171c..2ef346cb1 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -35,13 +35,13 @@ jobs: shell: bash - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" shell: bash @@ -81,13 +81,13 @@ jobs: shell: bash - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" shell: bash setup-java-ea-versions: @@ -115,13 +115,13 @@ jobs: shell: bash - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" shell: bash setup-java-custom-package-type: @@ -171,13 +171,13 @@ jobs: shell: bash - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" shell: bash setup-java-custom-architecture: @@ -207,11 +207,11 @@ jobs: - name: setup-java uses: ./ - id: setup-java + 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-java.outputs.path }}" + run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}" shell: bash \ No newline at end of file