chore(release): Fix getRedwoodRemote()

Tobbe · Dec 1, 2023 · 83c08d1 · 83c08d1
1 parent 5690333
commit 83c08d1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/tasks/release/prMilestoneCache.json b/tasks/release/prMilestoneCache.json
@@ -253,5 +253,6 @@
   "https://github.com/redwoodjs/redwood/pull/9211": "v6.3.0",
   "https://github.com/redwoodjs/redwood/pull/9464": "chore",
   "https://github.com/redwoodjs/redwood/pull/9392": "chore",
-  "https://github.com/redwoodjs/redwood/pull/9197": "RSC"
+  "https://github.com/redwoodjs/redwood/pull/9197": "RSC",
+  "https://github.com/redwoodjs/redwood/pull/9612": "chore"
 }
diff --git a/tasks/release/releaseLib.mjs b/tasks/release/releaseLib.mjs
@@ -165,7 +165,7 @@ export async function resolveBranchStatuses(branches) {
 }
 
 /**
- * Find the remote that points to `[email protected]:redwoodjs/redwood.git`.
+ * Find the remote that points to `redwoodjs/redwood.git`.
  */
 export async function getRedwoodRemote() {
   const result = {
@@ -181,7 +181,7 @@ export async function getRedwoodRemote() {
     }
 
     const found = remote.match(
-      /(?<name>\w+)\s+git@github\.com:redwoodjs\/redwood\.git/
+      /(?<name>\w+)\s+(git@|https:\/\/)github\.com(:|\/)redwoodjs\/redwood\.git/
     )
 
     if (found?.groups.name) {
@@ -191,7 +191,7 @@ export async function getRedwoodRemote() {
 
   if (!result.redwoodRemote) {
     result.error =
-      "Couldn't find a git remote that points to [email protected]:redwoodjs/redwood.git"
+      "Couldn't find a git remote that points to redwoodjs/redwood.git"
   }
 
   return result

diff --git a/tasks/release/tests/release.test.mjs b/tasks/release/tests/release.test.mjs
@@ -274,7 +274,8 @@ describe('releaseLib', () => {
   describe('resolveBranchStatuses', () => {
     test('getRedwoodRemote', async () => {
       const result = await releaseLib.getRedwoodRemote()
-      expect(result).toEqual({ redwoodRemote: 'origin' })
+      expect(result.redwoodRemote).toBeDefined()
+      expect(result.error).toBeUndefined()
     })
 
     test('getBranchesToCommits', async () => {

diff --git a/tasks/release/triage/main_next.commitTriageData.json b/tasks/release/triage/main_next.commitTriageData.json
@@ -325,27 +325,7 @@
   },
   "1e1c8d1a37d665ca5fc3c14649907dee1dec73fa": {
     "message": "fix(deps): update dependency @whatwg-node/server to v0.9.18 (#9602)",
-    "needsCherryPick": true
-  },
-  "75e0317e477fc9dc86bda1209e1506704d472ac6": {
-    "message": "fix(deps): update docusaurus monorepo to v3.0.1 (#9608)",
-    "needsCherryPick": true
-  },
-  "cef41b53d2c1b1cd1cc91ccf42ae7ffbaad0a67c": {
-    "message": "fix(deps): update dependency graphql-sse to v2.4.0 (#9607)",
-    "needsCherryPick": true
-  },
-  "969ee35d0d26038da83cbc8459abb030d2ac2d38": {
-    "message": "fix(deps): update dependency fs-extra to v11.2.0 (#9606)",
-    "needsCherryPick": true
-  },
-  "dfa7b0424f0f24a5271190bb3b94ba9c01684c45": {
-    "message": "fix(deps): update graphql-tools monorepo (#9609)",
-    "needsCherryPick": true
-  },
-  "02e3edcb808fe7e69f716bb5123da4a6fd13ec54": {
-    "message": "Add note about base 64 encoded event body (#9595)",
-    "needsCherryPick": true
+    "needsCherryPick": false
   },
   "a7ea8cdc35772234cbc7ac5e3c36446213ebe61a": {
     "message": "RSC: Include routing in initial RSC example app (#9611)",