ws_proto (#8)

cppalliance · Nov 19, 2024 · bd3e06a · bd3e06a
1 parent 3c59487
commit bd3e06a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 10 deletions.
diff --git a/jenkinsfiles/antora_libraries_1 b/jenkinsfiles/antora_libraries_1
@@ -36,10 +36,15 @@ pipeline {
                 # REPONAME=$(basename `git rev-parse --show-toplevel`)
                 DNSREPONAME=$(echo $REPONAME | tr '_' '-')
                 ORGANIZATION=$(basename $(dirname "${GIT_URL}"))
-                echo "export JENKINS_CI_REPO=cppalliance/jenkins-ci" >> jenkinsjobinfo.sh
-                echo "export JENKINS_CI_REPO_BRANCH=master" >> jenkinsjobinfo.sh
-                # echo "export JENKINS_CI_REPO=sdarwin/jenkins-ci" >> jenkinsjobinfo.sh
-                # echo "export JENKINS_CI_REPO_BRANCH=testing" >> jenkinsjobinfo.sh
+                if [[ "${GIT_URL}" =~ sdarwin ]]; then
+                    # testing environment
+                    echo "export JENKINS_CI_REPO=sdarwin/jenkins-ci" >> jenkinsjobinfo.sh
+                    echo "export JENKINS_CI_REPO_BRANCH=testing" >> jenkinsjobinfo.sh
+                else
+                    # standard
+                    echo "export JENKINS_CI_REPO=cppalliance/jenkins-ci" >> jenkinsjobinfo.sh
+                    echo "export JENKINS_CI_REPO_BRANCH=master" >> jenkinsjobinfo.sh
+                fi
                 echo "export PRTEST=prtest" >> jenkinsjobinfo.sh
                 echo "export REPONAME=${REPONAME}" >> jenkinsjobinfo.sh
                 echo "export DNSREPONAME=${DNSREPONAME}" >> jenkinsjobinfo.sh

diff --git a/jenkinsfiles/lcov_1 b/jenkinsfiles/lcov_1
@@ -42,10 +42,15 @@ pipeline {
                 # REPONAME=$(basename `git rev-parse --show-toplevel`)
                 DNSREPONAME=$(echo $REPONAME | tr '_' '-')
                 ORGANIZATION=$(basename $(dirname "${GIT_URL}"))
-                echo "export JENKINS_CI_REPO=cppalliance/jenkins-ci" >> jenkinsjobinfo.sh
-                echo "export JENKINS_CI_REPO_BRANCH=master" >> jenkinsjobinfo.sh
-                # echo "export JENKINS_CI_REPO=sdarwin/jenkins-ci" >> jenkinsjobinfo.sh
-                # echo "export JENKINS_CI_REPO_BRANCH=testing" >> jenkinsjobinfo.sh
+                if [[ "${GIT_URL}" =~ sdarwin ]]; then
+                    # testing environment
+                    echo "export JENKINS_CI_REPO=sdarwin/jenkins-ci" >> jenkinsjobinfo.sh
+                    echo "export JENKINS_CI_REPO_BRANCH=testing" >> jenkinsjobinfo.sh
+                else
+                    # standard
+                    echo "export JENKINS_CI_REPO=cppalliance/jenkins-ci" >> jenkinsjobinfo.sh
+                    echo "export JENKINS_CI_REPO_BRANCH=master" >> jenkinsjobinfo.sh
+                fi
                 echo "export PRTEST=prtest" >> jenkinsjobinfo.sh
                 echo "export REPONAME=${REPONAME}" >> jenkinsjobinfo.sh
                 echo "export DNSREPONAME=${DNSREPONAME}" >> jenkinsjobinfo.sh

diff --git a/jenkinsfiles/standard_libraries_1 b/jenkinsfiles/standard_libraries_1
@@ -33,8 +33,15 @@ pipeline {
                 # REPONAME=$(basename `git rev-parse --show-toplevel`)
                 DNSREPONAME=$(echo $REPONAME | tr '_' '-')
                 ORGANIZATION=$(basename $(dirname "${GIT_URL}"))
-                echo "export JENKINS_CI_REPO=cppalliance/jenkins-ci" >> jenkinsjobinfo.sh
-                echo "export JENKINS_CI_REPO_BRANCH=master" >> jenkinsjobinfo.sh
+                if [[ "${GIT_URL}" =~ sdarwin ]]; then
+                    # testing environment
+                    echo "export JENKINS_CI_REPO=sdarwin/jenkins-ci" >> jenkinsjobinfo.sh
+                    echo "export JENKINS_CI_REPO_BRANCH=testing" >> jenkinsjobinfo.sh
+                else
+                    # standard
+                    echo "export JENKINS_CI_REPO=cppalliance/jenkins-ci" >> jenkinsjobinfo.sh
+                    echo "export JENKINS_CI_REPO_BRANCH=master" >> jenkinsjobinfo.sh
+                fi
                 # echo "export JENKINS_CI_REPO=sdarwin/jenkins-ci" >> jenkinsjobinfo.sh
                 # echo "export JENKINS_CI_REPO_BRANCH=testing" >> jenkinsjobinfo.sh
                 echo "export PRTEST=prtest" >> jenkinsjobinfo.sh

diff --git a/scripts/cppalliance_ws_proto_prebuild.sh b/scripts/cppalliance_ws_proto_prebuild.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -xe
+echo "Using sudo"
+echo "export PRTEST=prtest3" >> jenkinsjobinfo.sh
+# Added to container
+# sudo apt-get update
+# sudo apt-get install -y openssl libssl-dev
+
+# How to make this more durable for future clang?
+# Or, URL has already been updated.
+echo "export CXX=/usr/bin/clang++-18" >> jenkinsjobinfo.sh
+echo "export CC=/usr/bin/clang-18" >> jenkinsjobinfo.sh