accept-to-ship-action 0.7.2 → 0.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.isPullRequestMerged = isPullRequestMerged;
13
- const request_error_1 = require("@octokit/request-error");
14
13
  function isPullRequestMerged(owner, repo, pullRequestNumber, octokit) {
15
14
  return __awaiter(this, void 0, void 0, function* () {
16
15
  try {
@@ -27,7 +26,15 @@ function isPullRequestMerged(owner, repo, pullRequestNumber, octokit) {
27
26
  }
28
27
  }
29
28
  catch (requestError) {
30
- if (requestError instanceof request_error_1.RequestError) {
29
+ if (
30
+ // It should be `requestError instanceof RequestError`
31
+ // but versions are in conflict with each other
32
+ requestError &&
33
+ typeof requestError === 'object' &&
34
+ 'status' in requestError &&
35
+ typeof requestError.status === 'number' &&
36
+ 'message' in requestError &&
37
+ typeof requestError.message === 'string') {
31
38
  if (requestError.status === 204) {
32
39
  return true;
33
40
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "accept-to-ship-action",
3
- "version": "0.7.2",
3
+ "version": "0.7.4",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.js",