Merge pull request #9 from CondeNast/fix/semver-pre-release

fix(run): handle version strings aren't strictly semver
CondeNast · Jan 5, 2024 · 5e4e334 · 5e4e334
2 parents 747bf9c + 788e6b4
commit 5e4e334
Show file tree

Hide file tree

Showing 4 changed files with 547 additions and 36 deletions.
diff --git a/lib/run.ts b/lib/run.ts
@@ -1,6 +1,6 @@
 import { getInput, info as logInfo } from "@actions/core";
 import { getOctokit } from "@actions/github";
-import { diff } from "semver";
+import { diff, coerce } from "semver";
 import { addLabelsToPR, tryAutoMergePR, autoApprovePR } from "./utils";
 
 const SNYK_UPGRADE_PR_TITLE_REGEXP = /\[Snyk\].+?[Uu]pgrade (.+?) from (.+?) to (.+?)$/;
@@ -58,8 +58,9 @@ export const run = async () => {
  const matches = pr.title.match(SNYK_UPGRADE_PR_TITLE_REGEXP);
  if (matches) {
  let pkgName = matches[1];
- let from = matches[2];
- let to = matches[3];
+ let from = coerce(matches[2]);
+ let to = coerce(matches[3]);
+ if (from === null || to === null) continue;
  diffType = diff(from, to);
  }
 

diff --git a/test/__fixtures/pulls.json b/test/__fixtures/pulls.json
@@ -164,7 +164,7 @@
  "parent": null
  }
  ],
- "labels": [ ],
+ "labels": [],
  "milestone": null,
  "draft": false,
  "commits_url": "https://api.github.com/repos/CondeNast/journey-purchase/pulls/1017/commits",
@@ -289,11 +289,7 @@
  "allow_forking": false,
  "is_template": false,
  "web_commit_signoff_required": false,
- "topics": [
- "martech",
- "order-forms",
- "subscriptions"
- ],
+ "topics": ["martech", "order-forms", "subscriptions"],
  "visibility": "internal",
  "forks": 1,
  "open_issues": 35,
@@ -418,11 +414,7 @@
  "allow_forking": false,
  "is_template": false,
  "web_commit_signoff_required": false,
- "topics": [
- "martech",
- "order-forms",
- "subscriptions"
- ],
+ "topics": ["martech", "order-forms", "subscriptions"],
  "visibility": "internal",
  "forks": 1,
  "open_issues": 35,
@@ -618,7 +610,7 @@
  "parent": null
  }
  ],
- "labels": [ ],
+ "labels": [],
  "milestone": null,
  "draft": false,
  "commits_url": "https://api.github.com/repos/CondeNast/journey-purchase/pulls/1015/commits",
@@ -743,11 +735,7 @@
  "allow_forking": false,
  "is_template": false,
  "web_commit_signoff_required": false,
- "topics": [
- "martech",
- "order-forms",
- "subscriptions"
- ],
+ "topics": ["martech", "order-forms", "subscriptions"],
  "visibility": "internal",
  "forks": 1,
  "open_issues": 35,
@@ -872,11 +860,7 @@
  "allow_forking": false,
  "is_template": false,
  "web_commit_signoff_required": false,
- "topics": [
- "martech",
- "order-forms",
- "subscriptions"
- ],
+ "topics": ["martech", "order-forms", "subscriptions"],
  "visibility": "internal",
  "forks": 1,
  "open_issues": 35,
@@ -1072,7 +1056,7 @@
  "parent": null
  }
  ],
- "labels": [ ],
+ "labels": [],
  "milestone": null,
  "draft": false,
  "commits_url": "https://api.github.com/repos/CondeNast/journey-purchase/pulls/1016/commits",
@@ -1197,11 +1181,7 @@
  "allow_forking": false,
  "is_template": false,
  "web_commit_signoff_required": false,
- "topics": [
- "martech",
- "order-forms",
- "subscriptions"
- ],
+ "topics": ["martech", "order-forms", "subscriptions"],
  "visibility": "internal",
  "forks": 1,
  "open_issues": 35,
@@ -1326,11 +1306,7 @@
  "allow_forking": false,
  "is_template": false,
  "web_commit_signoff_required": false,
- "topics": [
- "martech",
- "order-forms",
- "subscriptions"
- ],
+ "topics": ["martech", "order-forms", "subscriptions"],
  "visibility": "internal",
  "forks": 1,
  "open_issues": 35,