diff --git a/.github/workflows/pull-checks.yml b/.github/workflows/pull-checks.yml index 9329fcdfb..d4d1d4f56 100644 --- a/.github/workflows/pull-checks.yml +++ b/.github/workflows/pull-checks.yml @@ -23,11 +23,21 @@ jobs: lines=$(git diff HEAD~1 -- CHANGELOG.md | wc -l) echo "::set-output name=lines::$lines" + - name: Get all changed file names + id: file-names + run: | + lines="$(git diff HEAD~1 --name-only)" + echo "Changed files:" + echo "$lines" + cnt="$(echo "$lines" | grep -v '^package-lock.json$' | wc -l)" + echo "That are $cnt changed files." + echo "::set-output name=num::$cnt" + - name: Error if the number of diff lines is zero run: | echo "::error file=CHANGELOG.md::There was no change in the changelog detected. Please fill in a valid entry into that file." exit 1 - if: ${{ steps.diff.outputs.lines == 0 }} + if: ${{ steps.diff.outputs.lines == 0 && steps.file-names.outputs.num > 0 }} appinfo: name: Check for matching app info file diff --git a/CHANGELOG.md b/CHANGELOG.md index db4968611..3627563df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ### Fixed - Refactor the code for image handling to make it testable [#933](https://github.com/nextcloud/cookbook/pull/933) @christianlupus +- Allow merging of PRs from dependabot with only changes to package-lock.json + [#952](https://github.com/nextcloud/cookbook/pull/952) @christianlupus ### Documentation - Enhanced the user documentation by adding some starter's information