This is an automated email from the ASF dual-hosted git repository.
eze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new 46bfc95 Update clang-format.pipeline
46bfc95 is described below
commit 46bfc9576bf0cd86fb50e90813c140184d09c101
Author: Evan Zelkowitz <[email protected]>
AuthorDate: Thu Sep 23 16:56:32 2021 -0600
Update clang-format.pipeline
---
jenkins/github/clang-format.pipeline | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/jenkins/github/clang-format.pipeline
b/jenkins/github/clang-format.pipeline
index 3439c3f..93faed3 100644
--- a/jenkins/github/clang-format.pipeline
+++ b/jenkins/github/clang-format.pipeline
@@ -15,9 +15,24 @@ pipeline {
echo "${sha1}"
checkout([$class: 'GitSCM',
branches: [[name: sha1]],
- extensions: [],
+ extensions: [
+ // We have to set an idenity for the merge step
because Git requires
+ // the user.name and user.email to be set to do a
merge.
+ [$class: "UserIdentity",
+ name: "ATS CI User",
+ email: "[email protected]"
+ ],
+ [$class: "PreBuildMerge",
+ options: [
+ mergeTarget: "${GITHUB_PR_TARGET_BRANCH}",
+ fastForwardMode: "NO_FF",
+ mergeRemote: "origin",
+ mergeStrategy: "DEFAULT"
+ ]
+ ],
+ ],
userRemoteConfigs: [[url: github_url, refspec:
'+refs/pull/*:refs/remotes/origin/pr/*']]])
- sh 'head -1 README'
+ sh 'git show -n 10 --decorate --graph --oneline --no-patch'
}
echo 'Finished Cloning'
}
@@ -26,15 +41,19 @@ pipeline {
steps {
echo 'Starting build'
dir('src') {
+ // STILL NEED TO MAKE CLANG_FORMAT IMG, Include Pip for
pep8
+ sh('head README')
+
sh '''#!/bin/bash
- git grep -IE ' +$' | fgrep -v '.gold:'
+ set -x
+ git grep -IE ' +$' | fgrep -v '.gold:' | fgrep -v
'.test_input'
if [ "1" != "$?" ]; then
echo "Error: Trailing whitespaces are not
allowed!"
echo "Error: Please run: git grep -IE ' +$'"
exit 1
fi
echo "Success! No trailing whitespace"
- git grep -IE $'\r$' | fgrep -v 'lib/yamlcpp'
+ git grep -IE $'\r$' | fgrep -v 'lib/yamlcpp' |
fgrep -v '.test_input'
if [ "1" != "$?" ]; then
echo "Error: Please make sure to run dos2unix
on the above file(s)"
exit 1
