This is an automated email from the ASF dual-hosted git repository.
bnolsen 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 8fb7185 Branch pipelines other (#304)
8fb7185 is described below
commit 8fb718552f195f8e9049ee89a6f7bd97699f9f62
Author: Brian Olsen <[email protected]>
AuthorDate: Wed Dec 13 06:43:22 2023 -0700
Branch pipelines other (#304)
* fix pipelines for branch- prefix
* update pipelines with branch- presets
---
jenkins/branch/CMakePresets.json | 38 ++++++++++++++++++++++++++++++--------
jenkins/branch/autest.pipeline | 2 +-
jenkins/branch/freebsd.pipeline | 4 +---
jenkins/branch/osx-m1.pipeline | 12 +++++-------
jenkins/branch/osx.pipeline | 13 +++++--------
5 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/jenkins/branch/CMakePresets.json b/jenkins/branch/CMakePresets.json
index 5499c8b..fe40b88 100644
--- a/jenkins/branch/CMakePresets.json
+++ b/jenkins/branch/CMakePresets.json
@@ -229,12 +229,7 @@
"displayName": "CI branch defaults",
"inherits": ["ci"],
"binaryDir": "${sourceDir}/build",
- "generator": "Unix Makefiles",
- "cacheVariables": {
- "CMAKE_BUILD_TYPE": "Debug",
- "CMAKE_INSTALL_PREFIX": "/tmp/ats",
- "BUILD_EXPERIMENTAL_PLUGINS": "ON"
- }
+ "generator": "Unix Makefiles"
},
{
"name": "branch-release",
@@ -257,8 +252,8 @@
"description": "Inherit to enable asan, build feature",
"hidden": true,
"cacheVariables": {
- "CMAKE_CXX_FLAGS_DEBUG": "-g -fsanitize=address",
- "CMAKE_C_FLAGS_DEBUG": "-g -fsanitize=address"
+ "CMAKE_CXX_FLAGS_DEBUG": "-g -fsanitize=address,undefined",
+ "CMAKE_C_FLAGS_DEBUG": "-g -fsanitize=address,undefined"
}
},
{
@@ -316,6 +311,33 @@
"ENABLE_EXAMPLE": "ON"
}
},
+ {
+ "name": "branch-freebsd",
+ "displayName": "CI branch freebsd",
+ "description": "Defaults for branch freebsd builds",
+ "inherits": ["branch"],
+ "generator": "Unix Makefiles"
+ },
+ {
+ "name": "branch-osx",
+ "displayName": "CI branch OSX",
+ "description": "Defaults for branch osx builds",
+ "inherits": ["branch"],
+ "generator": "Unix Makefiles",
+ "cacheVariables": {
+ "OPENSSL_ROOT_DIR": "/usr/local/opt/openssl"
+ }
+ },
+ {
+ "name": "branch-osx-m1",
+ "displayName": "CI branch OSX m1",
+ "description": "Defaults for branch osx-m1 builds",
+ "inherits": ["branch"],
+ "generator": "Unix Makefiles",
+ "cacheVariables": {
+ "OPENSSL_ROOT_DIR": "/opt/homebrew/opt/openssl"
+ }
+ },
{
"name": "branch-clang-analyzer",
"displayName": "CI branch clang analyzer",
diff --git a/jenkins/branch/autest.pipeline b/jenkins/branch/autest.pipeline
index 4aa9ca9..3b033ff 100644
--- a/jenkins/branch/autest.pipeline
+++ b/jenkins/branch/autest.pipeline
@@ -94,7 +94,7 @@ pipeline {
presetpath="../ci/jenkins/branch/CMakePresets.json"
[ -f "${presetpath}" ]
&& cp -f "${presetpath}" .
- cmake -B build --preset
autest
+ cmake -B build --preset
branch-autest
cmake --build build
-j`nproc` -v
cmake --install build -v
diff --git a/jenkins/branch/freebsd.pipeline b/jenkins/branch/freebsd.pipeline
index 4e75457..1344880 100644
--- a/jenkins/branch/freebsd.pipeline
+++ b/jenkins/branch/freebsd.pipeline
@@ -30,9 +30,7 @@ pipeline {
if [ -d cmake ]
then
- cmake -B build \
-
-DBUILD_EXPERIMENTAL_PLUGINS=ON \
-
-DCMAKE_INSTALL_PREFIX=/tmp/ats
+ cmake -B build
--preset=branch-freebsd
cmake --build build
-j`nproc` -v
else
autoreconf -fiv
diff --git a/jenkins/branch/osx-m1.pipeline b/jenkins/branch/osx-m1.pipeline
index 6feb2e3..84e743b 100644
--- a/jenkins/branch/osx-m1.pipeline
+++ b/jenkins/branch/osx-m1.pipeline
@@ -31,13 +31,11 @@ pipeline {
if [ -d cmake ]
then
CC="clang" \
- CXX="clang++" \
-
CXXFLAGS="-Qunused-arguments" \
- WITH_LIBCPLUSPLUS="yes"
\
- cmake -B build \
- -G "Unix
Makefiles" \
-
-DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl
- cmake --build build -j3 -v
+ CXX="clang++" \
+
CXXFLAGS="-Qunused-arguments" \
+
WITH_LIBCPLUSPLUS="yes" \
+ cmake -B build
--preset=branch-osx-m1
+ cmake --build build -j3
-v
else
autoreconf -fiv
CC="clang" \
diff --git a/jenkins/branch/osx.pipeline b/jenkins/branch/osx.pipeline
index 077143d..97cb67e 100644
--- a/jenkins/branch/osx.pipeline
+++ b/jenkins/branch/osx.pipeline
@@ -31,14 +31,11 @@ pipeline {
if [ -d cmake ]
then
CC="clang" \
- CXX="clang++" \
- CXXFLAGS="-Qunused-arguments" \
- WITH_LIBCPLUSPLUS="yes" \
- cmake -B build \
-
--preset ci \
- -G
"Unix Makefiles" \
-
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
- cmake --build build -j3 -v
+ CXX="clang++" \
+
CXXFLAGS="-Qunused-arguments" \
+
WITH_LIBCPLUSPLUS="yes" \
+ cmake -B build
--preset branch-osx
+ cmake --build
build -j3 -v
else
autoreconf -fiv
CC="clang" \
