GitHub Action: Changes to render-newsletter

Adjust/fix how find-modified-newsletter.sh identifies a new post

Author: bdougsand

.github/actions/render-newsletter/src/index.ts

@@ -20,7 +20,7 @@ function escapeData(s: string): string {
 }
 
 function setOutput(key: string, val: string) {
-  process.stdout.write(`::set-output name=${key}::${escapeData(val)}` + EOL);
+  process.stdout.write(`::set-output name=${key}::${escapeData(val)}${EOL}`);
 }
 
 const API_BASE = 'https://api.sendgrid.com/v3';

.github/workflows/find-modified-newsletter.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-post_path="$(git log --pretty=format: --name-only -1 --diff-filter=A \
+# Find the latest commit that doesn't change the actions or workflows
+commit_hash=$(git log --pretty=format:%H -1 -- ':/!.github/*')
+
+# Find new posts in the latest commit, if any
+post_path="$(git show --pretty=format: --name-only --diff-filter=A $commit_hash \
                      | grep '^_posts/' \
                      | head -n1)"
 
@@ -11,6 +15,8 @@ if [ -n "$post_path" ]; then
     fi
 
     post_path="$repo_root/$post_path"
+
+    echo Found post: $post_path
 fi
 
 echo "::set-output name=post_path::$post_path"

.github/workflows/send-newsletter.yml

@@ -9,12 +9,14 @@ jobs:
       - run: ./.github/workflows/get_domain.sh
         shell: bash
         id: site-domain
-      - run: ./.github/workflows/find-modified-newsletter.sh
-        shell: bash
+      - name: Find new post
         id: newsletter-path
-      - uses: ./.github/actions/render-newsletter
+        run: ./.github/workflows/find-modified-newsletter.sh
+        shell: bash
+      - name: Render newsletter
         if: ${{ steps.newsletter-path.outputs.post_path != '' }}
         id: newsletter
+        uses: ./.github/actions/render-newsletter
         with:
           text_path: "${{ steps.newsletter-path.outputs.post_path }}"
           template_path: "./.github/workflows/newsletter_template.html"