Skip to content

Commit

Permalink
Rename v2-preview to v2 in docs and tests (#151)
Browse files Browse the repository at this point in the history
  • Loading branch information
maxim-lobanov authored Apr 5, 2021
1 parent b53500d commit 8764a52
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 21 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/e2e-local-file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/e2e-publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/e2e-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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: '<distribution>'
java-version: ${{ matrix.java }}
Expand Down
22 changes: 11 additions & 11 deletions docs/advanced-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -43,7 +43,7 @@ steps:
```yaml
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2-preview
- uses: actions/setup-java@v2
with:
distribution: '<distribution>'
java-version: '11'
Expand All @@ -57,7 +57,7 @@ steps:
```yaml
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2-preview
- uses: actions/setup-java@v2
with:
distribution: '<distribution>'
java-version: '11'
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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: '<distribution>'
java-version: '11'
Expand All @@ -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'
Expand Down Expand Up @@ -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: '<distribution>'
java-version: '11'
Expand Down Expand Up @@ -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: '<distribution>'
java-version: '11'
Expand Down
4 changes: 2 additions & 2 deletions docs/switching-to-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down

0 comments on commit 8764a52

Please sign in to comment.