Merge branch 'main' into develop

Author: TinasheMTapera

.github/workflows/generate-newsletter.yml

@@ -13,17 +13,41 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Extract values from issue body
+      - name: Print raw issue body
+        run: |
+          echo "--------- GITHUB.EVENT.ISSUE.BODY ---------"
+          echo "${{ github.event.issue.body }}"
+          echo "-------------------------------------------"
+
+      - name: Extract values from issue title
         id: vars
         run: |
-          month=$(echo "${{ github.event.issue.body }}" | grep -i "Newsletter Month" -A 1 | tail -n 1 | xargs)
-          year=$(echo "${{ github.event.issue.body }}" | grep -i "Newsletter Year" -A 1 | tail -n 1 | xargs)
-          # Convert month name to MM
+          title="${{ github.event.issue.title }}"
+      
+          # Extract month and year using awk
+          month=$(echo "$title" | awk -F': ' '{print $2}' | awk '{print $1}')
+          year=$(echo "$title" | awk -F': ' '{print $2}' | awk '{print $2}')
+      
+          if [ -z "$month" ] || [ -z "$year" ]; then
+            echo "❌ Could not extract month or year from title."
+            echo "Title was: $title"
+            exit 1
+          fi
+      
           month_num=$(date -d "$month 1" '+%m')
-          date="${year}-${month_num}-01"
+          date="${year}-${month_num}"
           branch="feature/newsletter-${year}-${month_num}"
-          filename="_posts/${date}-newsletter.md"
-
+          filename="_posts/newsletters/${date}-newsletter.md"
+      
+          echo "✅ Parsed values:"
+          echo "  Title: $title"
+          echo "  Month: $month"
+          echo "  Year: $year"
+          echo "  Month Num: $month_num"
+          echo "  Date: $date"
+          echo "  Branch: $branch"
+          echo "  Filename: $filename"
+      
           echo "month=$month" >> $GITHUB_OUTPUT
           echo "month_num=$month_num" >> $GITHUB_OUTPUT
           echo "year=$year" >> $GITHUB_OUTPUT
@@ -56,3 +80,4 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh issue comment ${{ github.event.issue.number }} --body "Draft file created for **${{ steps.vars.outputs.month }} ${{ steps.vars.outputs.year }}** at \`${{ steps.vars.outputs.filename }}\` in branch \`${{ steps.vars.outputs.branch }}\`.\n\nYou can now:\n1. Open the branch in VS Code using GitFlow (\`feature/newsletter-${{ steps.vars.outputs.year }}-${{ steps.vars.outputs.month_num }}\`)\n2. Edit and review the draft\n3. Open a PR into \`develop\` when ready"
+