From b4c241cef91974b81efc2d19222639fc38935c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey=20Vilas?= Date: Tue, 8 Mar 2022 10:50:59 +0100 Subject: [PATCH] Update analysis.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Analysis: don't add "skip ci" to drone commit messages Messes up Github Actions and doesn't work on Drone anyway Signed-off-by: Álvaro Brey Vilas analysis: Fix commiter name and email Not drone anymore Signed-off-by: Álvaro Brey Vilas --- scripts/analysis/findbugs-up.rb | 4 ++-- scripts/analysis/lint-up.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/analysis/findbugs-up.rb b/scripts/analysis/findbugs-up.rb index 58a37bae28..50bc3f39c5 100644 --- a/scripts/analysis/findbugs-up.rb +++ b/scripts/analysis/findbugs-up.rb @@ -114,8 +114,8 @@ system ("git config --local user.email 'android@nextcloud.com'") # add previous FindBugs result file to git system ('git add ' + PREVIOUS_FINDBUGS_RESULTS_FILE) -# commit changes; Add "skip ci" so that we don't accidentally trigger another Drone build -system({"GIT_COMMITTER_EMAIL" => "drone@nextcloud.com", "GIT_AUTHOR_EMAIL" => "drone@nextcloud.com"}, 'git commit -sm "Drone: update FindBugs results to reflect reduced error/warning count [skip ci]"') +# commit changes +system({"GIT_COMMITTER_NAME" => git_user, "GIT_COMMITTER_EMAIL" => "android@nextcloud.com", "GIT_AUTHOR_EMAIL" => "android@nextcloud.com"}, 'git commit -sm "Analysis: update Spotbugs results to reflect reduced error/warning count"') # push to origin system ('git push origin HEAD:' + git_branch) diff --git a/scripts/analysis/lint-up.rb b/scripts/analysis/lint-up.rb index 361b0af064..2e02cc95b2 100644 --- a/scripts/analysis/lint-up.rb +++ b/scripts/analysis/lint-up.rb @@ -183,8 +183,8 @@ system ("git config --local user.email 'android@nextcloud.com'") # add previous Lint result file to git system ('git add ' + PREVIOUS_LINT_RESULTS_FILE) -# commit changes; Add "skip ci" so that we don't accidentally trigger another Drone build -system({"GIT_COMMITTER_EMAIL" => "drone@nextcloud.com", "GIT_AUTHOR_EMAIL" => "drone@nextcloud.com"}, 'git commit -sm "Drone: update Lint results to reflect reduced error/warning count [skip ci]"') +# commit changes +system({"GIT_COMMITTER_NAME" => git_user, "GIT_COMMITTER_EMAIL" => "android@nextcloud.com", "GIT_AUTHOR_EMAIL" => "android@nextcloud.com"}, 'git commit -sm "Analysis: update lint results to reflect reduced error/warning count"') # push to origin system ('git push origin HEAD:' + git_branch)