fix conflict resolution

This commit is contained in:
Piotr Kwiecinski 2024-03-07 19:42:38 +01:00
parent 24d8f1d22f
commit 6ecfbf1f1a
2 changed files with 3 additions and 1 deletions

View file

@ -10,7 +10,7 @@ jobs:
test: # make sure the action works on a clean machine without building test: # make sure the action works on a clean machine without building
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: ./ - uses: ./
with: with:
dep: list dep: list

View file

@ -121,6 +121,8 @@ async function dep() {
options.push('-o', `${key}=${value}`) options.push('-o', `${key}=${value}`)
} }
} }
} catch (e) {
console.error('Invalid JSON in options')
} }
try { try {