From 1fd9a3f0bd667eb3d1f546343bf1d0d14e3b2d25 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 11 Aug 2020 18:23:03 +0200 Subject: [PATCH 1/3] Add calens check to verify changelog entries in CI --- .drone.yml | 1 + changelog/unreleased/calens-check-ci.md | 3 +++ tools/check-changelog/main.go | 6 ++---- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/calens-check-ci.md 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" From 4122f7598213781350798e7bfc9eb32441be2471 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 11 Aug 2020 19:03:45 +0200 Subject: [PATCH 2/3] Negative test --- .drone.yml | 2 +- changelog/unreleased/calens-check-ci.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5d4ba30527..6c09cd6cb6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,7 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: - - make release-deps && /go/bin/calens + - make release-deps && /go/bin/calens > /dev/null - 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 index 8776ab6569..82ccc74b90 100644 --- a/changelog/unreleased/calens-check-ci.md +++ b/changelog/unreleased/calens-check-ci.md @@ -1,3 +1,3 @@ -Enhancement: Add calens check to verify changelog entries in CI +Enhancement: Add calens check to verify changelog entries in CI. https://github.com/cs3org/reva/pull/1077 From ebccc15ae4370825a20de804a6c2aa28b6e60349 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 11 Aug 2020 19:07:25 +0200 Subject: [PATCH 3/3] Revert negative test --- changelog/unreleased/calens-check-ci.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/calens-check-ci.md b/changelog/unreleased/calens-check-ci.md index 82ccc74b90..8776ab6569 100644 --- a/changelog/unreleased/calens-check-ci.md +++ b/changelog/unreleased/calens-check-ci.md @@ -1,3 +1,3 @@ -Enhancement: Add calens check to verify changelog entries in CI. +Enhancement: Add calens check to verify changelog entries in CI https://github.com/cs3org/reva/pull/1077