From 6ecfbf1f1ad6b83701faf26a1537726be770b424 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski Date: Thu, 7 Mar 2024 19:42:38 +0100 Subject: [PATCH] fix conflict resolution --- .github/workflows/test.yml | 2 +- index.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f61b4e3..497d54a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/index.js b/index.js index ac1c903..ae4ad58 100644 --- a/index.js +++ b/index.js @@ -121,6 +121,8 @@ async function dep() { options.push('-o', `${key}=${value}`) } } + } catch (e) { + console.error('Invalid JSON in options') } try {