Skip to content

Commit

Permalink
Merge pull request #34 from philips-software/develop
Browse files Browse the repository at this point in the history
Prepare for release
  • Loading branch information
JeroenKnoops authored Dec 23, 2021
2 parents 12b1f11 + d328bf5 commit 6c4df1a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Get SPDX license overview
| scanner-url | scanner-url (license-scanner) | `false` | |
| bombase-url | bombase-url (in case of mode: 'tree') | `false` | |
| upload-url | upload-url (f.e. BOM-bar) | `false` | |
| ort-version | philipssoftware/ort version (in case of mode: 'ort') | `false` | 2021-05-31 |
| ort-version | philipssoftware/ort version (in case of mode: 'ort') | `false` | 2021-11-24 |
| ort-file | Specifies an ort-file to override ORT scanning in this action. (in case of mode: 'ort') | `false` | |
| tree | file with tree input (in case of mode: 'tree') | `false` | |
| format | format input (in case of mode: 'tree') | `false` | |
Expand Down Expand Up @@ -79,10 +79,10 @@ Make sure you have a proper `.spdx-builder.yml` file in your project.
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '11.0.1'
java-version: '11.0.13'
- name: Create spdx-file
id: spdx-builder
uses: philips-software/spdx-action@v0.8.1
uses: philips-software/spdx-action@v0.9.1.1
with:
project: my-project
mode: ort
Expand All @@ -97,13 +97,13 @@ Make sure you have a proper `.spdx-builder.yml` file in your project.
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '11.0.1'
java-version: '11.0.13'
- name: Create tree
run: |
npm list --all --production > npm-dependencies.txt
- name: Create spdx-file
id: spdx-builder
uses: philips-software/spdx-action@v0.8.1
uses: philips-software/spdx-action@v0.9.1.1
with:
project: my-project
mode: 'tree'
Expand All @@ -121,10 +121,10 @@ Make sure you have a proper `.spdx-builder.yml` file in your project.
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '11.0.1'
java-version: '11.0.13'
- name: Create spdx-file
id: spdx-builder
uses: philips-software/spdx-action@v0.8.1
uses: philips-software/spdx-action@v0.9.1.1
with:
project: my-project
mode: 'blackduck'
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ inputs:
ort-version:
description: "philipssoftware/ort version (in case of mode: 'ort')"
required: false
default: '2021-05-31'
default: '2021-11-24'
ort-file:
description: "Specifies an ort-file to override ORT scanning in this action. (in case of mode: 'ort')"
required: false
Expand Down

0 comments on commit 6c4df1a

Please sign in to comment.