Merge pull request #653 from peter-evans/fix-error-handling
fix: change or->and to catch all errors
This commit is contained in:
commit
8c603dbb04
7
dist/index.js
vendored
7
dist/index.js
vendored
@ -911,8 +911,11 @@ class GitHubHelper {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
if (!e.message ||
|
if (e.message &&
|
||||||
!e.message.includes(`A pull request already exists for ${headBranch}`)) {
|
e.message.includes(`A pull request already exists for ${headBranch}`)) {
|
||||||
|
core.info(`A pull request already exists for ${headBranch}`);
|
||||||
|
}
|
||||||
|
else {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -58,9 +58,11 @@ export class GitHubHelper {
|
|||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (
|
if (
|
||||||
!e.message ||
|
e.message &&
|
||||||
!e.message.includes(`A pull request already exists for ${headBranch}`)
|
e.message.includes(`A pull request already exists for ${headBranch}`)
|
||||||
) {
|
) {
|
||||||
|
core.info(`A pull request already exists for ${headBranch}`)
|
||||||
|
} else {
|
||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user