Nick Taylor

Posted on Nov 6, 2022 • Edited on Jul 20 • Originally published at iamdeveloper.com

Automate and Auto-Merge Pull Requests using GitHub Actions and the GitHub CLI

#github #githubcli #githubactions #git

So I've written about how I automated content updates for my blog before. I even gave a talk on it.

Automate syndication of your content with Eleventy, dev.to, and GitHub Actions

Nick Taylor ・ May 26 '22

#eleventy #githubactions #node #webdev

This post builds off of that. I recently improved how I automate content updates for my blog. This is a recap in case you haven't read my post above.

How content automation was

I use dev.to as a headless CMS via the dev.to API. I run that in a nightly GitHub action that pulls the latest content, and if anything has changed, I merge those changes to the main branch. I also update my streaming page on my website with my latest videos from YouTube using the YouTube API.

This has been working fine, but it has some shortcomings:

Pushing straight to the main branch without a pull request (PR), there are no deploy previews on Netlify.
Branch protection was pretty loose
If there are issues building the site, I'll only know about it when it fails to build for production.

How content automation improved

So I decided to automate creating pull requests (PR) for content updates and auto-merge them as long as all my checks pass.

feat: automate creating PRs to push content updates for iamdeveloper.com #61

nickytonline posted on Nov 06, 2022

Description

Instead of pushing changes directly to main when updating blog posts or the streaming page for video content, a pull request (PR) is generated now that is auto-merged if any changes were committed.

This brings a few things with it:

Deploy previews on Netlify
Enforcing branch protection to require PRs
If there are issues and a check fails, the PR will not merge. Prior to this PR, if change were pushed, you'd only know if it failed on build during a build for production.

Here is an example post merge of this PR if you want to see it in action. https://github.com/nickytonline/iamdeveloper.com/pull/63

Issues & Related Documents

Closes #60

Post merge I wrote a blog post about all this. See Automate and Auto-Merge Pull Requests using GitHub Actions and the GitHub CLI

View on GitHub

Having a PR brings all the things that were lacking:

Now there are deploy previews on Netlify
Branch protection is more rigid. I require checks to pass as well as a pull request.
If a build fails, I'll see it happen for a deploy preview instead of a build for production.

Prepare your Repository for PR Automation

General Repository Settings

To be able to auto-merge a branch, you need to modify some settings in your repository. Navigate to, e.g. https://github.com/nickytonline/iamdeveloper.com/settings, scroll to the bottom of the general settings and ensure that Allow auto-merge is checked.

Optionally, what I did was auto-delete branches. If you want to do the same, ensure that Automatically delete head branches is checked.

Configuring Branch Protection

This is not required for what I'm demonstrating, but I and many others in the industry highly recommend enabling branch protection in general for a repository.

For the auto-merge PR use case, we'll add the following branch protection for the main branch:

Require PRs for the main branch
Do not require PR approvals

Require checks to pass

Automating an Auto-Merge PR

I already had a GitHub action in place to update content. They run once a day. For example, here is how the update blog posts action looks like

name: Get latest blog posts
on:
  schedule:
    # Everyday at midnight UTC
    - cron: '0 0 * * *'
  workflow_dispatch:

jobs:
  update_profile_data:
    name: Get latest blog posts
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v3
        with:
          node-version: 16.17.1
      - name: Get blog posts
        env:
          DEV_API_KEY: ${{ secrets.DEV_API_KEY }}
        run: |
          npm install
          node --experimental-fetch bin/generateDevToPosts.js
          node bin/generateHashnodeUrlMapping.js
      - name: Commit changes
        id: commit
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          git config user.name "GitHub Actions Bot"
          git config user.email "<>"
          git pull origin main
          git add .
          if [[ -n "$(git status --porcelain)" ]]; then
            git commit -m "chore (automated): update blog posts"
            git push origin main
          fi

The main things happening here are I'm getting the latest code from the main branch, and then I run

npm install
node --experimental-fetch bin/generateDevToPosts.js
node bin/generateHashnodeUrlMapping.js

If you're wondering why I'm using --experimental-fetch, it's because I'm using native fetch in Node.js 16.

The scripts above generate changes if any. If there are changes, they're committed and merged into the main branch.

git config user.name "GitHub Actions Bot"
git config user.email "<>"
git pull origin main
git add .
if [[ -n "$(git status --porcelain)" ]]; then
  git commit -m "chore (automated): update blog posts"
  git push origin main
fi

To use a PR instead, I went with the following, in this case, for updating blog posts.

PR_TITLE="chore (automated): update blog posts"
BRANCH_NAME="chore_automated_update_blog_posts_$(date +%s)"

git branch $BRANCH_NAME
git switch $BRANCH_NAME

# There are potentially multiple files if the blog post has images.
git add .

# See if we have any changes. We should.
if [[ -n "$(git status --porcelain)" ]]; then
  echo "Creating PR \"$PR_TITLE\" for branch $BRANCH_NAME"
  git commit -m "$PR_TITLE"
  git push origin $BRANCH_NAME
  gh pr create --title "$PR_TITLE" --body "This is an automated PR to update blog posts"
  gh pr merge --auto --delete-branch --squash "$BRANCH_NAME"
else
  # Shouldn't end up here, but log that there was nothing to sync
  echo "Looks like there was nothing to update."
fi

So like before, the GitHub action has already gotten the latest code from the main branch, and we've run our Node.js scripts to get the latest blog posts.

Instead of committing straight to the main branch, we now create a PR via the GitHub CLI.

gh pr create --title "$PR_TITLE" --body "This is an automated PR to update blog posts"

Once the pull request is created, the following GitHub CLI command sets up the PR to auto-merge if all the checks pass.

gh pr merge --auto --delete-branch --squash "$BRANCH_NAME"

The Result

After publishing this post, I ran the GitHub action, and this is the PR it generated and auto-merged.

chore (automated): update blog posts #64

github-actions[bot] posted on Nov 06, 2022

This is an automated PR to update blog posts

View on GitHub

And that's it. I love automated work, and GitHub Actions and the GitHub CLI facilitate this.

Photo by Richy Great on Unsplash

Other places you can find me at:

🎬 YouTube

🎬 Twitch
🎬 nickyt.live
💻 GitHub
👾 My Discord
🐦 Twitter/X
🧵 Threads
🎙 My Podcast
🗞️ One Tip a Week Newsletter
🌐 My Website

DEV Community