From 8764a52df183aa0ccea74521dfd9d506ffc7a19a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 5 Apr 2021 13:14:38 +0300 Subject: [PATCH] Rename v2-preview to v2 in docs and tests (#151) --- .github/workflows/build.yml | 1 - .github/workflows/e2e-local-file.yml | 1 - .github/workflows/e2e-publishing.yml | 1 - .github/workflows/e2e-versions.yml | 1 - README.md | 8 ++++---- docs/advanced-usage.md | 22 +++++++++++----------- docs/switching-to-v2.md | 4 ++-- 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d51129e..9eb0e32a 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: branches: - main - releases/* - - v2-preview paths-ignore: - '**.md' pull_request: diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index 39a09d2d..d17d12af 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -4,7 +4,6 @@ on: branches: - main - releases/* - - v2-preview paths-ignore: - '**.md' pull_request: diff --git a/.github/workflows/e2e-publishing.yml b/.github/workflows/e2e-publishing.yml index 90b02b95..1901b8d6 100644 --- a/.github/workflows/e2e-publishing.yml +++ b/.github/workflows/e2e-publishing.yml @@ -4,7 +4,6 @@ on: branches: - main - releases/* - - v2-preview paths-ignore: - '**.md' pull_request: diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index b7832e57..59ea96b8 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -4,7 +4,6 @@ on: branches: - main - releases/* - - v2-preview paths-ignore: - '**.md' pull_request: diff --git a/README.md b/README.md index d7c90e5d..76c19e3e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Inputs `java-version` and `distribution` are mandatory. See [Supported distribut ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'adopt' # See 'Supported distributions' for available options java-version: '11' @@ -35,7 +35,7 @@ steps: ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'zulu' # See 'Supported distributions' for available options java-version: '11' @@ -68,7 +68,7 @@ For Java distributions that are not cached on Hosted images, `check-latest` alwa ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'adopt' java-version: '11' @@ -88,7 +88,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup java - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: distribution: '' java-version: ${{ matrix.java }} diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index 214005e0..44194164 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -20,7 +20,7 @@ Inputs `java-version` and `distribution` are mandatory and needs to be provided. ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'adopt' java-version: '11' @@ -31,7 +31,7 @@ steps: ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'zulu' java-version: '11' @@ -43,7 +43,7 @@ steps: ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: '' java-version: '11' @@ -57,7 +57,7 @@ steps: ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: '' java-version: '11' @@ -73,7 +73,7 @@ steps: - run: | download_url="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz" wget -O $RUNNER_TEMP/java_package.tar.gz $download_url -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'jdkFile' jdkFile: ${{ runner.temp }}/java_package.tar.gz @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup java - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -117,7 +117,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup java - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: distribution: 'adopt' java-version: ${{ matrix.java }} @@ -135,7 +135,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: distribution: '' java-version: '11' @@ -149,7 +149,7 @@ jobs: GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password - name: Set up Apache Maven Central - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: # running setup-java again overwrites the settings.xml distribution: 'adopt' java-version: '11' @@ -245,7 +245,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: distribution: '' java-version: '11' @@ -277,7 +277,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 for Shared Runner - uses: actions/setup-java@v2-preview + uses: actions/setup-java@v2 with: distribution: '' java-version: '11' diff --git a/docs/switching-to-v2.md b/docs/switching-to-v2.md index dd386234..a3a93d1e 100644 --- a/docs/switching-to-v2.md +++ b/docs/switching-to-v2.md @@ -5,7 +5,7 @@ Use the `zulu` keyword if you would like to continue using the same distribution ```yaml steps: - uses: actions/checkout@v2 -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'zulu' java-version: '11' @@ -22,7 +22,7 @@ steps: - run: | download_url="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz" wget -O $RUNNER_TEMP/java_package.tar.gz $download_url -- uses: actions/setup-java@v2-preview +- uses: actions/setup-java@v2 with: distribution: 'jdkFile' jdkFile: ${{ runner.temp }}/java_package.tar.gz