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 1129fc9  Us -DCMAKE_CXX_STANDARD=20 to set c++20 (#241)
1129fc9 is described below

commit 1129fc9bf38fb30670aefba2168bdb11ecf2f2ab
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Tue Oct 17 10:49:55 2023 -0500

    Us -DCMAKE_CXX_STANDARD=20 to set c++20 (#241)
    
    Get rid of the ugly sed and use -DCMAKE_CXX_STANDARD=20 now that it is
    supported.
---
 jenkins/github/fedora.pipeline | 5 +++--
 jenkins/github/ubuntu.pipeline | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jenkins/github/fedora.pipeline b/jenkins/github/fedora.pipeline
index 34b8ed6..34bfbf0 100644
--- a/jenkins/github/fedora.pipeline
+++ b/jenkins/github/fedora.pipeline
@@ -50,8 +50,9 @@ pipeline {
 
                         if [ -d cmake ]
                         then
-                            sed -i 's/CMAKE_CXX_STANDARD 17/CMAKE_CXX_STANDARD 
20/g' CMakeLists.txt
-                            cmake -B build --preset ci
+                            # We don't use c++20 features yet, but we want to 
make
+                            # sure we can build with the flag set.
+                            cmake -B build --preset ci -DCMAKE_CXX_STANDARD=20
                             cmake --build build -v
                             cmake --install build
                             pushd build
diff --git a/jenkins/github/ubuntu.pipeline b/jenkins/github/ubuntu.pipeline
index c4844cf..219621d 100644
--- a/jenkins/github/ubuntu.pipeline
+++ b/jenkins/github/ubuntu.pipeline
@@ -56,9 +56,7 @@ pipeline {
 
                             # We don't use c++20 features yet, but we want to 
make
                             # sure we can build with the flag set.
-                            sed -i 's/CMAKE_CXX_STANDARD 17/CMAKE_CXX_STANDARD 
20/g' CMakeLists.txt
-
-                            cmake -B build --preset ci
+                            cmake -B build --preset ci -DCMAKE_CXX_STANDARD=20
                             cmake --build build -v
                             cmake --install build
                             pushd build

Reply via email to