diff --git a/.drone.yml b/.drone.yml index 1ff1b33d8c..5d4ba30527 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,6 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: + - make release-deps && /go/bin/calens - make check-changelog-drone PR=$DRONE_PULL_REQUEST environment: GITHUB_API_TOKEN: diff --git a/changelog/unreleased/calens-check-ci.md b/changelog/unreleased/calens-check-ci.md new file mode 100644 index 0000000000..8776ab6569 --- /dev/null +++ b/changelog/unreleased/calens-check-ci.md @@ -0,0 +1,3 @@ +Enhancement: Add calens check to verify changelog entries in CI + +https://github.com/cs3org/reva/pull/1077 diff --git a/tools/check-changelog/main.go b/tools/check-changelog/main.go index 2c9ce582a2..45892119cf 100644 --- a/tools/check-changelog/main.go +++ b/tools/check-changelog/main.go @@ -62,10 +62,8 @@ func main() { prID := flag.Int("pr", 0, "the ID of the PR") flag.Parse() - if *prID > 0 { - if skipPR(*prID) { - return - } + if *prID > 0 && skipPR(*prID) { + return } branch := "master"