diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml new file mode 100644 index 0000000..310eff4 --- /dev/null +++ b/.github/workflows/check_pr.yml @@ -0,0 +1,35 @@ +name: Check branch conformity +on: + pull_request: + types: [opened, synchronize, reopened] + +jobs: + prevent-fixup-commits: + runs-on: ubuntu-latest + env: + target: debian-bookworm + distro: debian + version: bookworm + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: prevent fixup commits + run: | + git fetch origin + git status + git log --pretty=format:%s origin/main..HEAD | grep -ie '^fixup\|^wip' && exit 1 || true + + check-changelog: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: ensure CHANGELOG.md is populated + run: | + CHANGELOG_MODIFIED=$(git diff --name-only ${GITHUB_SHA} | grep -c "CHANGELOG.md") + if [ $CHANGELOG_MODIFIED -eq 0 ]; then + echo "::error::No CHANGELOG modifications found in this pull request. Please update the CHANGELOG." + exit 1 + fi diff --git a/.github/workflows/check_push.yml b/.github/workflows/check_push.yml deleted file mode 100644 index 0b92efc..0000000 --- a/.github/workflows/check_push.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Check branch conformity -on: - push: - -jobs: - prevent-fixup-commits: - runs-on: ubuntu-latest - env: - target: debian-bookworm - distro: debian - version: bookworm - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: prevent fixup commits - run: | - git fetch origin - git status - git log --pretty=format:%s origin/main..HEAD | grep -ie '^fixup\|^wip' && exit 1 || true diff --git a/CHANGELOG.md b/CHANGELOG.md index bade81d..95473ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or ## [Unreleased](https://github.com/freedomofpress/dangerzone/compare/v0.8.0...HEAD) +### Development changes + +- CI: Check that the changelog is populated on each pull request ([#995](https://github.com/freedomofpress/dangerzone/pull/995)) + + ## [0.8.0](https://github.com/freedomofpress/dangerzone/compare/v0.8.0...0.7.1) ### Added