ci

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: |
@@ -39,7 +73,7 @@ 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) {
@@ -99,7 +133,7 @@ jobs:
                 console.log(`PR created: ${result.data.html_url}`);
               } catch (error) {
                 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;