Merge pull request #276 from SolidOS/release

Release hotFix
Wait for PR being available

Author: bourgeoa

release.hotFix.config.json

@@ -0,0 +1,58 @@
+{
+  "defaultBranch": "main",
+  "skipIfNoDiff": true,
+  "defaultInstall": "npm install",
+  "defaultTest": "npm test",
+  "defaultBuild": "npm run build",
+  "modes": {
+    "stable": {
+      "branch": "main",
+      "versionBump": "patch",
+      "npmTag": "latest",
+      "gitTag": true,
+      "gitPush": true
+    },
+    "test": {
+      "branch": "dev",
+      "versionBump": "prerelease",
+      "preid": "test",
+      "npmTag": "test",
+      "gitTag": false,
+      "gitPush": false
+    }
+  },
+  "repos": [
+    {
+      "name": "contacts-pane",
+      "path": "workspaces/contacts-pane",
+      "repo": "https://github.com/SolidOS/contacts-pane.git",
+      "afterInstall": [
+        "npm install solid-ui@latest solid-logic@latest rdflib@latest"
+      ]
+    },
+    {
+      "name": "profile-pane",
+      "path": "workspaces/profile-pane",
+      "repo": "https://github.com/SolidOS/profile-pane.git",
+      "afterInstall": [
+        "npm install chat-pane@latest contacts-pane solid-ui@latest pane-registry@latest solid-logic@latest rdflib@latest"
+      ]
+    },
+    {
+      "name": "solid-panes",
+      "path": "workspaces/solid-panes",
+      "repo": "https://github.com/SolidOS/solid-panes.git",
+      "afterInstall": [
+          "npm install activitystreams-pane@latest chat-pane@latest contacts-pane folder-pane@latest issue-pane@latest meeting-pane@latest pane-registry@latest profile-pane source-pane@latest solid-ui solid-logic@latest solid-namespace@latest rdflib@latest"
+      ]
+    },
+    {
+      "name": "mashlib",
+      "path": "workspaces/mashlib",
+      "repo": "https://github.com/SolidOS/mashlib.git",
+      "afterInstall": [
+        "npm install solid-panes solid-ui@latest solid-logic@latest rdflib@latest"
+      ]
+    }
+  ]
+}

scripts/release-orchestrator.js

@@ -461,22 +461,34 @@ function waitForPRMerge(repoDir, repo, headBranch, baseBranch, dryRun, options =
   }
 
   try {
-    // Find the PR number for this head branch
+    // Find the PR number for this head branch. Right after gh pr create,
+    // list/search APIs can lag for a few seconds.
     const prQuery = `gh pr list --repo ${slug} --head ${headBranch} --base ${baseBranch} --state open --json number --jq '.[0].number'`;
+    const prDiscoveryTimeoutMs = options.prDiscoveryTimeoutMs || 2 * 60 * 1000;
+    const prDiscoveryPollIntervalMs = options.prDiscoveryPollIntervalMs || 5000;
+    const prDiscoveryStart = Date.now();
     let prNumber;
-    try {
-      prNumber = parseInt(runQuiet(prQuery, repoDir), 10);
-    } catch (err) {
-      if (required) {
-        throw new Error(`No open PR found for ${headBranch} -> ${baseBranch}`);
+
+    while ((Date.now() - prDiscoveryStart) < prDiscoveryTimeoutMs) {
+      try {
+        const rawNumber = String(runQuiet(prQuery, repoDir) || '').trim();
+        prNumber = parseInt(rawNumber, 10);
+      } catch (err) {
+        prNumber = NaN;
       }
-      console.log(`No open PR found for ${headBranch} -> ${baseBranch}`);
-      return { status: 'skip', reason: 'no-pr' };
+
+      if (prNumber) {
+        break;
+      }
+
+      const waitedSeconds = Math.floor((Date.now() - prDiscoveryStart) / 1000);
+      console.log(`  Waiting for PR to appear for ${headBranch} -> ${baseBranch} (${waitedSeconds}s elapsed)...`);
+      sleepMs(prDiscoveryPollIntervalMs);
     }
 
     if (!prNumber) {
       if (required) {
-        throw new Error(`No open PR found for ${headBranch} -> ${baseBranch}`);
+        throw new Error(`No open PR found for ${headBranch} -> ${baseBranch} after waiting ${Math.floor(prDiscoveryTimeoutMs / 1000)}s`);
       }
       console.log(`No open PR found for ${headBranch} -> ${baseBranch}`);
       return { status: 'skip', reason: 'no-pr' };