This is an automated email from the ASF dual-hosted git repository.
bneradt 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 70d16af Format updates for Catch2 v3 (#388)
70d16af is described below
commit 70d16aff590cca08736197569cd8f1bdb832d312
Author: Brian Neradt <[email protected]>
AuthorDate: Wed Aug 13 20:53:48 2025 -0500
Format updates for Catch2 v3 (#388)
---
jenkins/bin/format.sh | 2 ++
jenkins/branch/coverage.pipeline | 1 +
jenkins/github/format.pipeline | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/jenkins/bin/format.sh b/jenkins/bin/format.sh
index 7055597..fa70c1e 100755
--- a/jenkins/bin/format.sh
+++ b/jenkins/bin/format.sh
@@ -22,6 +22,7 @@ cd "${WORKSPACE}/src"
# First, make sure there are no trailing WS!!!
git grep -IE ' +$' | \
fgrep -v 'lib/yamlcpp' | \
+ fgrep -v 'lib/Catch2' | \
fgrep -v 'lib/systemtap' | \
fgrep -v '.gold:' | \
fgrep -v '.test_input'
@@ -35,6 +36,7 @@ echo "Success! No trailing whitespace"
# Unix format please!
git grep -IE $'\r$' | \
fgrep -v 'lib/yamlcpp' | \
+ fgrep -v 'lib/Catch2' | \
fgrep -v 'lib/systemtap' | \
fgrep -v '.test_input'
if [ "1" != "$?" ]; then
diff --git a/jenkins/branch/coverage.pipeline b/jenkins/branch/coverage.pipeline
index 8ffa2a4..6e292e5 100644
--- a/jenkins/branch/coverage.pipeline
+++ b/jenkins/branch/coverage.pipeline
@@ -225,6 +225,7 @@ pipeline {
'/usr/*' \
'*/TestBox.h' \
'*/lib/yamlcpp/*' \
+
'*/lib/Catch2/*' \
'*/lib/systemtap/*' \
'*/test/*' \
'*/test_*' \
diff --git a/jenkins/github/format.pipeline b/jenkins/github/format.pipeline
index cc86c04..9c46557 100644
--- a/jenkins/github/format.pipeline
+++ b/jenkins/github/format.pipeline
@@ -59,14 +59,14 @@ pipeline {
dir('src') {
sh '''#!/bin/bash
set -x
- git grep -IE ' +$' | fgrep -v 'lib/yamlcpp' |
fgrep -v 'lib/systemtap' | fgrep -v '.gold:' | fgrep -v '.test_input'
+ git grep -IE ' +$' | fgrep -v 'lib/yamlcpp' |
fgrep -v 'lib/Catch2' | fgrep -v 'lib/systemtap' | 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' |
fgrep -v 'lib/systemtap' | fgrep -v '.test_input'
+ git grep -IE $'\r$' | fgrep -v 'lib/yamlcpp' |
fgrep -v 'lib/Catch2' | fgrep -v 'lib/systemtap' | fgrep -v '.test_input'
if [ "1" != "$?" ]; then
echo "Error: Please make sure to run dos2unix
on the above file(s)"
exit 1
