From f76160993110d5fc0f9e52f70323c4aaaa4b01cb Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 11 Mar 2021 11:03:19 +0300 Subject: [PATCH] rename adoptium to adopt --- README.md | 10 +++++----- docs/advanced-usage.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 532f079e..e1f6b813 100644 --- 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 Adoptium (formerly known as AdoptOpenJDK) out of the box. V1 supports only Zulu OpenJDK +- V2 supports custom distributions and provides support for Zulu OpenJDK and Adopt OpenJDK 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 @@ -25,7 +25,7 @@ steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v2-preview with: - distribution: 'adoptium' # See 'Supported distributions' for available options + distribution: 'adopt' # See 'Supported distributions' for available options java-version: '11' - run: java -cp java HelloWorldApp ``` @@ -42,8 +42,8 @@ The `java-version` input supports an exact version or a version range using [Sem Currently, the following distributions are supported: | Keyword | Distribution | Official site | License | |-|-|-|-| -| `zulu` | 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/) | -| `adoptium` | Adoptium (formerly AdoptOpenJDK) | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html) +| `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` | Adopt OpenJDK | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.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. @@ -68,7 +68,7 @@ jobs: ### Advanced - [Selecting a Java distribution](docs/advanced-usage.md#Selecting-a-Java-distribution) - - [Adoptium](docs/advanced-usage.md#Adoptium) + - [Adopt](docs/advanced-usage.md#Adopt) - [Zulu](docs/advanced-usage.md#Zulu) - [Installing custom Java package type](docs/advanced-usage.md#Installing-custom-Java-package-type) - [Installing custom Java architecture](docs/advanced-usage.md#Installing-custom-Java-architecture) diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index 54ca1086..c45bd0c7 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -1,6 +1,6 @@ # Usage - [Selecting a Java distribution](#Selecting-a-Java-distribution) - - [Adoptium](#Adoptium) + - [Adopt](#Adopt) - [Zulu](#Zulu) - [Installing custom Java package type](#Installing-custom-Java-package-type) - [Installing custom Java architecture](#Installing-custom-Java-architecture) @@ -15,13 +15,13 @@ See [action.yml](../action.yml) for more details on task inputs. ## Selecting a Java distribution Input `distribution` is mandatory and needs to be provided. See [Supported distributions](../README.md#Supported-distributions) for a list of available options. -### Adoptium +### Adopt ```yaml steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v2-preview with: - distribution: 'adoptium' + distribution: 'adopt' java-version: '11' - run: java -cp java HelloWorldApp ``` @@ -90,7 +90,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - distribution: [ 'zulu', 'adoptium' ] + distribution: [ 'zulu', 'adopt' ] java: [ '8', '11', '13', '15' ] name: Java ${{ matrix.Java }} (${{ matrix.distribution }}) sample steps: @@ -118,7 +118,7 @@ jobs: - name: Setup java uses: actions/setup-java@v2-preview with: - distribution: 'adoptium' + distribution: 'adopt' java-version: ${{ matrix.java }} - run: java -cp java HelloWorldApp ```