Skip to content

Latest commit

 

History

History
69 lines (56 loc) · 2.88 KB

README.md

File metadata and controls

69 lines (56 loc) · 2.88 KB

Pull request changelog entries action Tests

A GitHub actions that:

  1. Extracts changelog entries from a pull request body
  2. Adds the changelog entries to the CHANGELOG.md after merge

Avoiding changelog merge conflicts

At Vendic every pull request needs a change in CHANGELOG.md. We follow the keep a changelog format. It costs a lot of time to fix the merge conflicts that come from mulltiple pull requests that are modifying the changelog.

After a lengthy internal discussion, we had the idea that we could extract the changelog entries (using regular expressions) from the pull request body after the PR is merged. Next, we would add it to the CHANGELOG.md using a NodeJS keep a changelog library and some git actions.

This repo is a result of that idea and it contains the workflows that you need to work with changelogs merge conflict-free.

Usage

Internally we are using a pull request template so that the pull requests are consistent:

## Description
<!-- Please include a summary of the changes and the related issue. Please also include relevant context. -->

## How Has This Been Tested?
<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->

## Changelog
<!-- Available topics: Added, Changed, Deprecated, Removed, Fixed, Security -->
### Changed
<!-- Add bullet list of changes here -->

### Fixed
<!-- Add bullet list of fixes here -->

Actions workflow:

name: Modify changelog

on:
  pull_request:
    types: [ closed ]

jobs:
  modify_changelog:
    name: Modify changelog
    if: ${{ github.event.pull_request.merged == true }}
    runs-on: ubuntu
    steps:
      - name: Extract changelog entries from PR body and modify CHANGELOG.md
        uses: Vendic/github-add-changelog-action@develop
        with:
          committer_username: "YourUserName"
          committer_email: [email protected]
          token: ${{ secrets.YOUR_GITHUB_TOKEN }}

In addition to that we also check if every pull request body contains a Changelog section:

name: Pull request actions

on:
  pull_request:
    types: [ opened, synchronize ]

jobs:
  check_changelog_message:
    name: Check changelog message
    runs-on: ubuntu
    steps:
      - name: Chck if PR body contains changelog entries
        run: |
          echo "${{ github.event.pull_request.body }}" | grep "## Changelog"