Merge branch 'master' of https://github.com/hyde-project/hyde into dev

Author: kRHYME7

.github/workflows/ci.yml

@@ -16,6 +16,40 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Generate commit history and calculate suggested merge date
+      - name: Generate commit history and schedule
+        id: generate-commits
+        run: |
+          # Get the commit history between master and dev
+          COMMIT_LIST=$(git log --pretty=format:"* %s (%h) by %an" origin/master..origin/dev)
+
+          # Handle empty commit list (branches are identical)
+          if [ -z "$COMMIT_LIST" ]; then
+            COMMIT_LIST="No new commits - branches may be identical"
+          fi
+
+          # Calculate suggested merge date based on release policy
+          # By default, suggesting next Monday as merge date - adjust according to your policy
+          MERGE_DATE=$(date -d "next Monday" +"%A, %B %d, %Y")
+
+          # Save commit list to a file (to handle multi-line output)
+          echo "$COMMIT_LIST" > commit_list.txt
+
+          # Create a PR body with the commit list and suggested merge date
+          echo "PR_BODY<<EOF" >> $GITHUB_ENV
+          echo "This is an automated PR to promote changes from \`dev\` to \`master\`." >> $GITHUB_ENV
+          echo "" >> $GITHUB_ENV
+          echo "## Suggested Merge Schedule" >> $GITHUB_ENV
+          echo "According to our release policy, this PR is expected to be merged on: **$MERGE_DATE**" >> $GITHUB_ENV
+          echo "" >> $GITHUB_ENV
+          echo "## Commits to be merged:" >> $GITHUB_ENV
+          echo "\`\`\`" >> $GITHUB_ENV
+          cat commit_list.txt >> $GITHUB_ENV
+          echo "\`\`\`" >> $GITHUB_ENV
+          echo "" >> $GITHUB_ENV
+          echo "Please review the changes carefully before merging." >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
       # Use a fixed branch name for the PR
       - name: Update dev-to-master branch
         run: |
@@ -30,7 +64,7 @@ jobs:
           git checkout -b $BRANCH_NAME
           git push --force origin $BRANCH_NAME
 
-      # Create or update PR using GitHub API
+      # Create or update PR using GitHub API with retry logic
       - name: Create or Update Pull Request
         uses: actions/github-script@v6
         with:
@@ -39,41 +73,69 @@ jobs:
             const { repo, owner } = context.repo;
             const prBranch = "automated-dev-to-master-branch";
             const prTitle = "Promote dev changes to master";
-            const prBody = "This is an automated PR to promote changes from `dev` to `master`.\n\nPlease review the changes carefully before merging.";
+            const prBody = process.env.PR_BODY;
+
+            // Retry helper function
+            async function retryOperation(operation, maxRetries = 3, delay = 5000) {
+              let lastError;
+              for (let attempt = 1; attempt <= maxRetries; attempt++) {
+                try {
+                  return await operation();
+                } catch (error) {
+                  lastError = error;
+                  console.log(`Attempt ${attempt}/${maxRetries} failed: ${error.message}`);
+                  if (attempt < maxRetries) {
+                    console.log(`Waiting ${delay/1000} seconds before retry...`);
+                    await new Promise(resolve => setTimeout(resolve, delay));
+                  }
+                }
+              }
+              throw lastError;
+            }
 
             // Check if PR already exists
-            const prs = await github.rest.pulls.list({
-              owner,
-              repo,
-              head: `${owner}:${prBranch}`,
-              base: 'master',
-              state: 'open'
+            const prs = await retryOperation(async () => {
+              return github.rest.pulls.list({
+                owner,
+                repo,
+                head: `${owner}:${prBranch}`,
+                base: 'master',
+                state: 'open'
+              });
             });
 
             if (prs.data.length > 0) {
               // Update existing PR
               console.log(`Updating existing PR #${prs.data[0].number}`);
-              await github.rest.pulls.update({
-                owner,
-                repo,
-                pull_number: prs.data[0].number,
-                title: prTitle,
-                body: prBody
+              await retryOperation(async () => {
+                return github.rest.pulls.update({
+                  owner,
+                  repo,
+                  pull_number: prs.data[0].number,
+                  title: prTitle,
+                  body: prBody
+                });
               });
+              console.log(`PR #${prs.data[0].number} updated successfully.`);
             } else {
               // Create new PR
               try {
-                const result = await github.rest.pulls.create({
-                  owner,
-                  repo,
-                  title: prTitle,
-                  body: prBody,
-                  head: prBranch,
-                  base: 'master'
+                const result = await retryOperation(async () => {
+                  return github.rest.pulls.create({
+                    owner,
+                    repo,
+                    title: prTitle,
+                    body: prBody,
+                    head: prBranch,
+                    base: 'master'
+                  });
                 });
                 console.log(`PR created: ${result.data.html_url}`);
               } catch (error) {
-                console.log(`Error creating PR: ${error.message}`);
+                console.log(`All attempts to create PR failed: ${error.message}`);
+                
+                // As a fallback, output command for manual PR creation
+                console.log(`To create the PR manually, visit: https://github.com/${owner}/${repo}/compare/master...${prBranch}`);
                 throw error;
               }
             }