Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b2da088
Implement support for custom vendors in setup-java
Mar 8, 2021
cfdcd68
minor improvements
Mar 8, 2021
1d25bcb
minor refactoring
Mar 8, 2021
330fe63
Add unit tests and e2e tests
Mar 8, 2021
ab1f15d
Update documentation for setup-java@v2 release
Mar 8, 2021
c65c532
minor improvements
Mar 8, 2021
9979ab3
regenerate dist
Mar 8, 2021
e6d2942
fix comments
Mar 9, 2021
f02cd99
Merge branch 'implement-v2-installers' into implement-v2-tests
Mar 9, 2021
87febe1
resolve comments
Mar 9, 2021
7006d0b
resolve comments
Mar 9, 2021
54adc86
fix tests
Mar 9, 2021
6738676
Update README.md
maxim-lobanov Mar 9, 2021
50ef02a
Apply suggestions from code review
maxim-lobanov Mar 9, 2021
fb17d02
fix minor nitpicks
Mar 10, 2021
408d6f3
handle 4th digit
Mar 10, 2021
793a1df
Merge branch 'implement-v2-installers' into implement-v2-tests
Mar 10, 2021
e9a0f2c
pull latest main
Mar 10, 2021
caf7917
Merge branch 'implement-v2-installers' into implement-v2-docs
Mar 10, 2021
f6c63d8
Update README.md
Mar 10, 2021
c94ef7c
rename adoptium to adopt
Mar 11, 2021
2ff07ea
Merge branch 'implement-v2-installers' into implement-v2-tests
Mar 11, 2021
491094c
rename adoptium to adopt
Mar 11, 2021
4423435
Merge branch 'implement-v2-installers' into implement-v2-docs
Mar 11, 2021
f761609
rename adoptium to adopt
Mar 11, 2021
03ecfa0
Update README.md
Mar 11, 2021
fde2f0f
make java-version and distribution required for action
Mar 12, 2021
0f6f6e1
Merge pull request #133 from actions/implement-v2-tests
maxim-lobanov Mar 15, 2021
20a04c5
Merge pull request #134 from actions/implement-v2-docs
maxim-lobanov Mar 15, 2021
fc17803
update readme
Mar 15, 2021
f20fd47
fix tests
Mar 15, 2021
f74bcbe
fix e2e tests
Mar 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update readme
  • Loading branch information
Maxim Lobanov
Maxim Lobanov committed Mar 15, 2021
commit fc1780360a4ec74b1d6d35357237967b9c55cc4a
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This action provides the following functionality for GitHub Actions runners:
- 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
Input `distribution` is mandatory. See [Supported distributions](../README.md#Supported-distributions) section for a list of available options.
Inputs `java-version` and `distribution` are mandatory. See [Supported distributions](../README.md#Supported-distributions) section for a list of available options.

### Basic
```yaml
Expand Down
16 changes: 9 additions & 7 deletions docs/advanced-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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.
Inputs `java-version` and `distribution` are mandatory and needs to be provided. See [Supported distributions](../README.md#Supported-distributions) for a list of available options.

### Adopt
```yaml
Expand Down Expand Up @@ -133,11 +133,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v2-preview
with:
distribution: '<distribution>'
java-version: '8'
java-version: '11'

- name: Build with Maven
run: mvn -B package --file pom.xml
Expand All @@ -150,6 +150,8 @@ jobs:
- name: Set up Apache Maven Central
uses: actions/setup-java@v2-preview
with: # running setup-java again overwrites the settings.xml
distribution: 'adopt'
java-version: '11'
server-id: maven # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME # env variable for username in deploy
server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
Expand Down Expand Up @@ -239,11 +241,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v2-preview
with:
distribution: '<distribution>'
java-version: '8'
java-version: '11'

- name: Build with Gradle
run: gradle build
Expand Down Expand Up @@ -271,11 +273,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 8 for Shared Runner
- name: Set up JDK 11 for Shared Runner
uses: actions/setup-java@v2-preview
with:
distribution: '<distribution>'
java-version: '8'
java-version: '11'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file

Expand Down