From a25c0ffe1faca6d65c6a0c87f142dc4d4cfa1374 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Tue, 3 Aug 2021 19:14:29 +0200
Subject: [PATCH] Update end-to-end tests in GitHub workflows

---
 .github/workflows/e2e-local-file.yml | 39 +++++++++++++++++++++++++-
 .github/workflows/e2e-versions.yml   | 41 ++++++++++++++++++++++++----
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml
index d17d12af..4f4cd032 100644
--- a/.github/workflows/e2e-local-file.yml
+++ b/.github/workflows/e2e-local-file.yml
@@ -83,4 +83,41 @@ jobs:
           architecture: x64
       - name: Verify Java version
         run: bash __tests__/verify-java.sh "11.0" "${{ steps.setup-java.outputs.path }}"
-        shell: bash
\ No newline at end of file
+        shell: bash
+
+  setup-java-local-file-temurin:
+    name: Validate installation from local file Eclipse Temurin
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Download Eclipse Temurin file
+        run: |
+          if ($IsLinux) {
+            $downloadUrl = "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
+            $localFilename = "java_package.tar.gz"
+          } elseif ($IsMacOS) {
+            $downloadUrl = "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz"
+            $localFilename = "java_package.tar.gz"
+          } elseif ($IsWindows) {
+            $downloadUrl = "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.zip"
+            $localFilename = "java_package.zip"
+          }
+          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-ea'
+          architecture: x64
+      - name: Verify Java version
+        run: bash __tests__/verify-java.sh "11.0.12" "${{ steps.setup-java.outputs.path }}"
+        shell: bash
diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml
index ee0b457a..f06694d5 100644
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@@ -19,8 +19,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adopt', 'adopt-openj9', 'zulu'] # internally 'adopt-hotspot' is the same as 'adopt'
-        version: ['8', '11', '15']
+        distribution: ['adopt', 'adopt-openj9', 'temurin', 'zulu'] # internally 'adopt-hotspot' is the same as 'adopt'
+        version: ['8', '11', '16']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -57,6 +57,15 @@ jobs:
           - distribution: 'adopt'
             version: '12.0.2+10.1'
             os: ubuntu-latest
+          - distribution: 'temurin'
+            version: '16.0.2+7'
+            os: macos-latest
+          - distribution: 'temurin'
+            version: '16.0.2+7'
+            os: windows-latest
+          - distribution: 'temurin'
+            version: '16.0.2+7'
+            os: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -78,7 +87,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adopt', 'zulu']
+        distribution: ['adopt', 'temurin', 'zulu']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -137,6 +146,28 @@ jobs:
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
 
+  setup-java-ea-versions-temurin:
+    name: adopt ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
+    needs: setup-java-major-minor-versions
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        version: ['17-ea']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: setup-java
+        uses: ./
+        id: setup-java
+        with:
+          java-version: ${{ matrix.version }}
+          distribution: temurin
+      - 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 }}
     needs: setup-java-major-minor-versions
@@ -145,10 +176,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adopt', 'zulu']
+        distribution: ['adopt', 'temurin', 'zulu']
         java-package: ['jre']
         version:
-        - '15.0'
+        - '16.0'
         include:
           - distribution: 'zulu'
             java-package: jre+fx