Skip to content

Commit 6ecfbf1

Browse files
fix conflict resolution
1 parent 24d8f1d commit 6ecfbf1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test: # make sure the action works on a clean machine without building
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: ./
1515
with:
1616
dep: list

index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ async function dep() {
121121
options.push('-o', `${key}=${value}`)
122122
}
123123
}
124+
} catch (e) {
125+
console.error('Invalid JSON in options')
124126
}
125127

126128
try {

0 commit comments

Comments
 (0)