Add support for Eclipse Temurin (#201)

* Add support for Adoptium OpenJDK Refs #191 * Rename distribution to Eclipse Temurin * Update end-to-end tests in GitHub workflows * Exclude e2e tests for Temurin JREs for now * fix version * Update e2e-versions.yml * Handle Eclipse Temurin version suffixes ("beta") * Add test for new version suffix "beta" * Add updated `index.js` * fix an issue Co-authored-by: Maxim Lobanov <maxim-lobanov@github.com>
actions · Aug 6, 2021 · 4b1b3d4 · 4b1b3d4
1 parent ad01d13
commit 4b1b3d4
Show file tree

Hide file tree

Showing 10 changed files with 9,484 additions and 11 deletions.
diff --git 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
+ 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
@@ -11,6 +11,7 @@ on:
  - '**.md'
  schedule:
  - cron: '0 */12 * * *'
+ workflow_dispatch:
 jobs:
  setup-java-major-versions:
  name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
@@ -19,8 +20,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 +58,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 +88,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 +147,28 @@ jobs:
  run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
  shell: bash
 
+ setup-java-ea-versions-temurin:
+ name: temurin ${{ 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 +177,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
@@ -158,6 +190,10 @@ jobs:
  java-package: jdk+fx
  version: '8.0.242'
  os: ubuntu-latest
+ exclude:
+ # Eclipse Temurin currently doesn't publish JREs, only JDKs
+ - distribution: 'temurin'
+ java-package: 'jre'
  steps:
  - name: Checkout
  uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This action provides the following functionality for GitHub Actions runners:
 - Registering problem matchers for error output
 
 ## V2 vs V1
-- V2 supports custom distributions and provides support for Zulu OpenJDK and Adopt OpenJDK out of the box. V1 supports only Zulu OpenJDK
+- V2 supports custom distributions and provides support for Zulu OpenJDK, Adopt OpenJDK and Eclipse Temurin out of the box. V1 supports only Zulu OpenJDK
 - V2 requires you to specify distribution along with the version. V1 defaults to Zulu OpenJDK, only version input is required. Follow [the migration guide](docs/switching-to-v2.md) to switch from V1 to V2
 
 ## Usage
@@ -31,6 +31,17 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
+**Eclipse Temurin**
+```yaml
+steps:
+- uses: actions/checkout@v2
+- uses: actions/setup-java@v2
+ with:
+ distribution: 'temurin' # See 'Supported distributions' for available options
+ java-version: '8'
+- run: java -cp java HelloWorldApp
+```
+
 **Zulu OpenJDK**
 ```yaml
 steps:
@@ -55,6 +66,7 @@ Currently, the following distributions are supported:
 | `zulu` | Zulu OpenJDK | [Link](https://www.azul.com/downloads/zulu-community/?package=jdk) | [Link](https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/) |
 | `adopt` or `adopt-hotspot` | Adopt OpenJDK Hotspot | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html)
 | `adopt-openj9` | Adopt OpenJDK OpenJ9 | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html)
+| `temurin` | Eclipse Temurin | [Link](https://adoptium.net/) | [Link](https://adoptium.net/about.html)
 
 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.