Incorporate feedback

Author: janhohenheim

.github/create_newsletter_scaffold.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ -z "${NEWSLETTER_MONTH}" ]]; then
+  echo "NEWSLETTER_MONTH is not set. Exiting..."
+  exit 1
+fi
+
+if [[ -z "${NEWSLETTER_YEAR}" ]]; then
+  echo "NEWSLETTER_YEAR is not set. Exiting..."
+  exit 1
+fi
+
+if [[ -z "${NEWSLETTER_DEADLINE}" ]]; then
+  echo "NEWSLETTER_DEADLINE is not set. Exiting..."
+  exit 1
+fi
+
+if [[ -z "${NEWSLETTER_COUNTER}" ]]; then
+  echo "NEWSLETTER_COUNTER is not set. Exiting..."
+  exit 1
+fi
+
+cp newsletter-template.md index.md
+sed -i "s/{{\s*NEWSLETTER_MONTH\s*}}/${NEWSLETTER_MONTH}/g" index.md
+sed -i "s/{{\s*NEWSLETTER_YEAR\s*}}/${NEWSLETTER_YEAR}/g" index.md
+sed -i "s/{{\s*NEWSLETTER_DEADLINE\s*}}/${NEWSLETTER_DEADLINE}/g" index.md
+sed -i "s/{{\s*NEWSLETTER_COUNTER\s*}}/${NEWSLETTER_COUNTER}/g" index.md
+# Create a dir in content/news with the counter with 3 digits as name
+destination="content/news/$(printf "%03d" ${NEWSLETTER_COUNTER})"
+mkdir -p $destination
+mv index.md $destination/index.md
+git status

.github/workflows/create-newsletter.yaml

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: source
       - name: Set environment variables
         run: |
           echo "NEWSLETTER_MONTH=$(date +'%B')" >> $GITHUB_ENV
@@ -21,21 +23,12 @@ jobs:
           # take the amount of months since feb 2024 and add 50
           echo "NEWSLETTER_COUNTER=$(( ( ( $(date +'%Y') - 2024 ) * 12 + $(date +'%m') - 2 ) + 50 ))" >> $GITHUB_ENV
       - name: Create newsletter scaffold
-        run: |
-          cp newsletter-template.md index.md
-          sed -i "s/{{\s*NEWSLETTER_MONTH\s*}}/${{ env.NEWSLETTER_MONTH }}/g" index.md
-          sed -i "s/{{\s*NEWSLETTER_YEAR\s*}}/${{ env.NEWSLETTER_YEAR }}/g" index.md
-          sed -i "s/{{\s*NEWSLETTER_DEADLINE\s*}}/${{ env.NEWSLETTER_DEADLINE }}/g" index.md
-          sed -i "s/{{\s*NEWSLETTER_COUNTER\s*}}/${{ env.NEWSLETTER_COUNTER }}/g" index.md
-          # Create a dir in content/news with the counter with 3 digits as name
-          destination="content/news/$(printf "%03d" ${{ env.NEWSLETTER_COUNTER }})"
-          mkdir -p $destination
-          mv index.md $destination/index.md
-          git status
+        run: ./.github/create_newsletter_scaffold.sh
       - name: Commit and push changes
         uses: EndBug/add-and-commit@v9
         with:
           message: "Create newsletter N${{ env.NEWSLETTER_COUNTER }} for ${{ env.NEWSLETTER_MONTH }} ${{ env.NEWSLETTER_YEAR }}"
+          push: "origin HEAD:source"
       - name: Create tracking issue
         uses: JasonEtco/create-an-issue@v2
         env: