mirror of
https://github.com/deployphp/action.git
synced 2025-04-01 19:06:35 +00:00
fix conflict resolution
This commit is contained in:
parent
24d8f1d22f
commit
6ecfbf1f1a
2 changed files with 3 additions and 1 deletions
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
@ -10,7 +10,7 @@ jobs:
|
|||
test: # make sure the action works on a clean machine without building
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ./
|
||||
with:
|
||||
dep: list
|
||||
|
|
2
index.js
2
index.js
|
@ -121,6 +121,8 @@ async function dep() {
|
|||
options.push('-o', `${key}=${value}`)
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Invalid JSON in options')
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
Loading…
Add table
Reference in a new issue