From cae220fce9f18b2e897b62080ddd0eeb374679da Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 13:34:26 +0200 Subject: [PATCH 01/10] Skip changelog enforcement for bot PRs --- .drone.yml | 1 + .github/config.yml | 1 + .github/dependabot.yml | 2 ++ changelog/unreleased/changelog-skip-bots.md | 3 +++ 4 files changed, 7 insertions(+) create mode 100644 changelog/unreleased/changelog-skip-bots.md diff --git a/.drone.yml b/.drone.yml index d38370f155..9de439e216 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,6 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: + - echo (git show -s --format='%cN' $DRONE_COMMIT) - make check-changelog-drone - name: license-check diff --git a/.github/config.yml b/.github/config.yml index f324da9d77..06682f674f 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -8,6 +8,7 @@ updateDocsWhiteList: - Tests-only - tests-only - Tests-Only + - Build-deps updateDocsTargetFiles: - changelog/unreleased/ diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 881d60d277..c229bac37e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,8 @@ updates: directory: "/" schedule: interval: daily + commit-message: + prefix: "[Build-deps]" open-pull-requests-limit: 10 reviewers: - ishank011 diff --git a/changelog/unreleased/changelog-skip-bots.md b/changelog/unreleased/changelog-skip-bots.md new file mode 100644 index 0000000000..f3452abc92 --- /dev/null +++ b/changelog/unreleased/changelog-skip-bots.md @@ -0,0 +1,3 @@ +Enhancement: Skip changelog enforcement for bot PRs. + +https://github.com/cs3org/reva/pull/979 From 3a916afd22f50a31cd56ad225cb5a69743960d27 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 13:40:19 +0200 Subject: [PATCH 02/10] Update echo command --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9de439e216..4703b33c59 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,7 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: - - echo (git show -s --format='%cN' $DRONE_COMMIT) + - echo $(git show -s --format='%cN' $DRONE_COMMIT) - make check-changelog-drone - name: license-check From e416ef36e7d4739ae7f6faf93798d927f2133324 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 13:51:18 +0200 Subject: [PATCH 03/10] Skip check for dependabot --- .drone.yml | 1 - Makefile | 2 +- tools/check-changelog/main.go | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4703b33c59..d38370f155 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,7 +125,6 @@ steps: - name: changelog image: golang:1.13 commands: - - echo $(git show -s --format='%cN' $DRONE_COMMIT) - make check-changelog-drone - name: license-check diff --git a/Makefile b/Makefile index 653b64f161..18c6243232 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ check-changelog: go run tools/check-changelog/main.go check-changelog-drone: - go run tools/check-changelog/main.go -repo origin + go run tools/check-changelog/main.go -repo origin -user $(git show -s --format='%cN' $DRONE_COMMIT) # to be run in CI platform ci: build-ci test lint-ci diff --git a/tools/check-changelog/main.go b/tools/check-changelog/main.go index 55f86e6f06..b4ddb58ebe 100644 --- a/tools/check-changelog/main.go +++ b/tools/check-changelog/main.go @@ -28,8 +28,15 @@ import ( func main() { repo := flag.String("repo", "", "the remote repo against which diff-index is to be derived") + user := flag.String("user", "", "the user who created the PR") flag.Parse() + // Skip changelog check for PRs created by bots + if *user == "dependabot[bot]" { + log.Print("Skipping changelog check for PRs created by: " + *user) + return + } + branch := "master" if *repo != "" { branch = *repo + "/master" From 2a8ac6f901e94d1747167e15e3fed7c4347d1cbe Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:06:37 +0200 Subject: [PATCH 04/10] test --- Makefile | 4 +++- tools/check-changelog/main.go | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18c6243232..0a70986279 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,9 @@ check-changelog: go run tools/check-changelog/main.go check-changelog-drone: - go run tools/check-changelog/main.go -repo origin -user $(git show -s --format='%cN' $DRONE_COMMIT) + user=$(git show -s --format='%cN' $DRONE_COMMIT) + echo $user + go run tools/check-changelog/main.go -repo origin -user $user # to be run in CI platform ci: build-ci test lint-ci diff --git a/tools/check-changelog/main.go b/tools/check-changelog/main.go index b4ddb58ebe..e496bea791 100644 --- a/tools/check-changelog/main.go +++ b/tools/check-changelog/main.go @@ -21,6 +21,7 @@ package main import ( "errors" "flag" + "fmt" "log" "os/exec" "strings" @@ -31,6 +32,8 @@ func main() { user := flag.String("user", "", "the user who created the PR") flag.Parse() + fmt.Println("User: " + *user) + // Skip changelog check for PRs created by bots if *user == "dependabot[bot]" { log.Print("Skipping changelog check for PRs created by: " + *user) From a6b3057ee5acab6e515443653af929c03c28e11b Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:12:27 +0200 Subject: [PATCH 05/10] test --- .drone.yml | 1 + Makefile | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index d38370f155..4703b33c59 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,6 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: + - echo $(git show -s --format='%cN' $DRONE_COMMIT) - make check-changelog-drone - name: license-check diff --git a/Makefile b/Makefile index 0a70986279..d81ff512d7 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,8 @@ check-changelog: go run tools/check-changelog/main.go check-changelog-drone: - user=$(git show -s --format='%cN' $DRONE_COMMIT) - echo $user - go run tools/check-changelog/main.go -repo origin -user $user + echo $(git show -s --format='%cN' $DRONE_COMMIT) + go run tools/check-changelog/main.go -repo origin -user "$(git show -s --format='%cN' $DRONE_COMMIT)" # to be run in CI platform ci: build-ci test lint-ci From 9b9e6b781e11fbf7f7e2b180c7df91f6511a1afe Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:18:31 +0200 Subject: [PATCH 06/10] test --- .drone.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4703b33c59..14e4551dd0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,7 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: - - echo $(git show -s --format='%cN' $DRONE_COMMIT) + - export PR_CREATOR=$(git show -s --format='%cN' $DRONE_COMMIT) - make check-changelog-drone - name: license-check diff --git a/Makefile b/Makefile index d81ff512d7..a6e3e5a811 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,8 @@ check-changelog: go run tools/check-changelog/main.go check-changelog-drone: - echo $(git show -s --format='%cN' $DRONE_COMMIT) - go run tools/check-changelog/main.go -repo origin -user "$(git show -s --format='%cN' $DRONE_COMMIT)" + echo $PR_CREATOR + go run tools/check-changelog/main.go -repo origin -user $PR_CREATOR # to be run in CI platform ci: build-ci test lint-ci From e63acac973191ab43262ee2655949b0fc5e5aa41 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:25:02 +0200 Subject: [PATCH 07/10] test --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 14e4551dd0..3624eac591 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,8 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: - - export PR_CREATOR=$(git show -s --format='%cN' $DRONE_COMMIT) - - make check-changelog-drone + - make check-changelog-drone PR_CREATOR=$(git show -s --format='%cN' $DRONE_COMMIT) - name: license-check image: golang:1.13 From 45b309a73b8491a94b6b608f32d2bd88506ef2cf Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:33:21 +0200 Subject: [PATCH 08/10] test --- .drone.yml | 2 +- Makefile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3624eac591..5332ca2ec5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -125,7 +125,7 @@ steps: - name: changelog image: golang:1.13 commands: - - make check-changelog-drone PR_CREATOR=$(git show -s --format='%cN' $DRONE_COMMIT) + - make check-changelog-drone PR_CREATOR="$(git show -s --format='%cN' $DRONE_COMMIT)" - name: license-check image: golang:1.13 diff --git a/Makefile b/Makefile index a6e3e5a811..a3f89e7cb3 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,7 @@ check-changelog: go run tools/check-changelog/main.go check-changelog-drone: - echo $PR_CREATOR - go run tools/check-changelog/main.go -repo origin -user $PR_CREATOR + go run tools/check-changelog/main.go -repo origin -user "$(PR_CREATOR)" # to be run in CI platform ci: build-ci test lint-ci From e8245aa70a5590e8496f673000d4e5e1d417f6dd Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:41:56 +0200 Subject: [PATCH 09/10] Remove log --- tools/check-changelog/main.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/check-changelog/main.go b/tools/check-changelog/main.go index e496bea791..b4ddb58ebe 100644 --- a/tools/check-changelog/main.go +++ b/tools/check-changelog/main.go @@ -21,7 +21,6 @@ package main import ( "errors" "flag" - "fmt" "log" "os/exec" "strings" @@ -32,8 +31,6 @@ func main() { user := flag.String("user", "", "the user who created the PR") flag.Parse() - fmt.Println("User: " + *user) - // Skip changelog check for PRs created by bots if *user == "dependabot[bot]" { log.Print("Skipping changelog check for PRs created by: " + *user) From 03bc2ba736fa58907ea35cfd5fc27a53665d2120 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Thu, 16 Jul 2020 14:43:04 +0200 Subject: [PATCH 10/10] Final change --- tools/check-changelog/main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/check-changelog/main.go b/tools/check-changelog/main.go index b4ddb58ebe..33c55392b7 100644 --- a/tools/check-changelog/main.go +++ b/tools/check-changelog/main.go @@ -31,9 +31,10 @@ func main() { user := flag.String("user", "", "the user who created the PR") flag.Parse() + log.Print("PR created by: " + *user) // Skip changelog check for PRs created by bots if *user == "dependabot[bot]" { - log.Print("Skipping changelog check for PRs created by: " + *user) + log.Print("Skipping changelog check") return }