Compare commits

..

2 Commits

Author SHA1 Message Date
8764a52df1 Rename v2-preview to v2 in docs and tests (#151) 2021-04-05 13:14:38 +03:00
b53500dabc Merge "v2-preview" branch into "main" (#150)
* actions/setup-java@v2 - Support different distributions (#132)

* Implement support for custom vendors in setup-java

* minor improvements

* minor refactoring

* Add unit tests and e2e tests

* Update documentation for setup-java@v2 release

* minor improvements

* regenerate dist

* fix comments

* resolve comments

* resolve comments

* fix tests

* Update README.md

Co-authored-by: George Adams <george.adams@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* fix minor nitpicks

* handle 4th digit

* pull latest main

* Update README.md

* rename adoptium to adopt

* rename adoptium to adopt

* rename adoptium to adopt

* Update README.md

* make java-version and distribution required for action

* update readme

* fix tests

* fix e2e tests

Co-authored-by: George Adams <george.adams@microsoft.com>
Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* Add "overwrite-settings" input parameter (#136)

* add overwrite-settings parameter

* fix e2e tests

* print debug

* fix e2e tests

* add comment

* remove comment

* Add "Contents/Home" postfix on macOS if provider creates it (#139)

* Update e2e-versions.yml

* Update e2e-versions.yml

* implement fix

* Update e2e-versions.yml

* Update installer.ts

* fix filter logic

* Update e2e-versions.yml

* remove extra logic

* Update e2e-versions.yml

* Add check-latest flag (#141)

* add changes for check-latest

* run prerelease script

* resolving comments

* fixing tests

* fix spelling

* improve core.info messages

* run format

* run prerelease

* change version to fix test

* resolve comment for check-latest

* Update README.md

* added hosted tool cache section

* Apply suggestions from code review

Co-authored-by: Maxim Lobanov <v-malob@microsoft.com>
Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* Avoid "+" sign in Java path in v2-preview (#145)

* try to handle _ versions

* more logs

* more debug

* test 1

* more fixes

* fix typo

* Update e2e-versions.yml

* add unit-tests

* remove debug info from tests

* debug pre-cached versions

* change e2e tests to ubuntu-latest

* update npm licenses

Co-authored-by: George Adams <george.adams@microsoft.com>
Co-authored-by: Konrad Pabjan <konradpabjan@github.com>
Co-authored-by: Dmitry Shibanov <dmitry-shibanov@github.com>
2021-04-05 13:02:27 +03:00
7 changed files with 17 additions and 21 deletions

View File

@ -5,7 +5,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:

View File

@ -4,7 +4,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:

View File

@ -4,7 +4,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:

View File

@ -4,7 +4,6 @@ on:
branches:
- main
- releases/*
- v2-preview
paths-ignore:
- '**.md'
pull_request:

View File

@ -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: '<distribution>'
java-version: ${{ matrix.java }}

View File

@ -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: '<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: '<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: '<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: '<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: '<distribution>'
java-version: '11'

View File

@ -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