Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into releases/v2
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Apr 6, 2020
2 parents b8e6d4c + 64c06af commit 63ea49d
Show file tree
Hide file tree
Showing 9 changed files with 623 additions and 587 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ jobs:

- uses: ./
with:
servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
properties: '[{"prop1": "value1"}, {"prop2": "value2"}]'
mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
sonatypeSnapshots: true

- run: cat ~/.m2/settings.xml
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

# Editors
.vscode
.idea

# Logs
logs
Expand Down
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,22 @@ steps:
- uses: s4u/maven-settings-action@v2
```
Create ```settings.xml``` with server section:
Create ```settings.xml``` with servers section:
```yml
steps:
- uses: s4u/maven-settings-action@v2
with:
servers: '[{"id": "serverId", "username": "username", "password": "password"}]'
```

Create ```settings.xml``` with mirrors section:
```yml
steps:
- uses: s4u/maven-settings-action@v2
with:
mirrors: '[{"id": "mirrorId", "name": "mirrorName", "mirrorOf": "mirrorOf", "url": "mirrorUrl"}]'
```

Create ```settings.xml``` with maven properties:
```yml
steps:
Expand Down
3 changes: 3 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ inputs:
servers:
description: 'servers definition in joson array, eg: [{"id": "serverId", "username": "username", "password": "password"}]'
required: false
mirrors:
description: 'mirrors definition in json array, eg: [{"id": "id", "name": "name", "mirrorOf": "mirrorOf", "url": "url"}]'
required: false
properties:
description: 'json array with properties, eg [{"propertyName1": "propertyValue1"}, {"propertyName2": "propertyValue2"}]'
required: false
Expand Down
Loading

0 comments on commit 63ea49d

Please sign in to comment.