From 128ae7c1303d80730d5db9f84575f191fdd4979d Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Mon, 4 Jan 2021 18:15:38 +0530 Subject: [PATCH 1/2] Run changelog check only if there are changes in the code --- changelog/unreleased/changelog-fix.md | 3 +++ tools/check-changelog/main.go | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/changelog-fix.md diff --git a/changelog/unreleased/changelog-fix.md b/changelog/unreleased/changelog-fix.md new file mode 100644 index 0000000000..0e7d7c833d --- /dev/null +++ b/changelog/unreleased/changelog-fix.md @@ -0,0 +1,3 @@ +Bugfix: Run changelog check only if there are changes in the code + +https://github.com/cs3org/reva/pull/1385 diff --git a/tools/check-changelog/main.go b/tools/check-changelog/main.go index 45892119cf..2accea1ae1 100644 --- a/tools/check-changelog/main.go +++ b/tools/check-changelog/main.go @@ -70,11 +70,22 @@ func main() { if *repo != "" { branch = *repo + "/master" } - cmd := exec.Command("git", "diff-index", branch, "--", "changelog/unreleased") + + cmd := exec.Command("git", "diff-index", branch, "--", ".") out, err := cmd.Output() if err != nil { log.Fatal(err) } + // Return successfully if there are no changes + if len(out) == 0 { + return + } + + cmd = exec.Command("git", "diff-index", branch, "--", "changelog/unreleased") + out, err = cmd.Output() + if err != nil { + log.Fatal(err) + } mods := strings.Split(string(out), "\n") for _, m := range mods { From f8e59fc93725c889915b586d7cb8ce2146d820b7 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Mon, 4 Jan 2021 18:53:16 +0530 Subject: [PATCH 2/2] Remove test from expected failures --- tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt index eee0289ba8..d3872f3500 100644 --- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt @@ -1456,7 +1456,6 @@ apiWebdavEtagPropagation1/moveFileFolder.feature:62 apiWebdavEtagPropagation1/moveFileFolder.feature:78 apiWebdavEtagPropagation1/moveFileFolder.feature:79 apiWebdavEtagPropagation1/moveFileFolder.feature:98 -apiWebdavEtagPropagation1/moveFileFolder.feature:99 apiWebdavEtagPropagation1/moveFileFolder.feature:146 apiWebdavEtagPropagation1/moveFileFolder.feature:147 apiWebdavEtagPropagation1/moveFileFolder.feature:174