boostlook (#3)

cppalliance · Oct 25, 2024 · 8cce76c · 8cce76c
1 parent 781b207
commit 8cce76c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/jenkinsfiles/standard_libraries_1 b/jenkinsfiles/standard_libraries_1
@@ -35,6 +35,8 @@ pipeline {
                 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
                 echo "export PRTEST=prtest" >> jenkinsjobinfo.sh
                 echo "export REPONAME=${REPONAME}" >> jenkinsjobinfo.sh
                 echo "export DNSREPONAME=${DNSREPONAME}" >> jenkinsjobinfo.sh
@@ -206,7 +208,7 @@ pipeline {
                 set -xe
 
                 . jenkinsjobinfo.sh
-                curl -f -o jenkins_postbuild_script.sh https://raw.githubusercontent.com/${JENKINS_CI_REPO}/master/scripts/${ORGANIZATION}_${REPONAME}_postbuild.sh || true
+                curl -f -o jenkins_postbuild_script.sh https://raw.githubusercontent.com/${JENKINS_CI_REPO}/${JENKINS_CI_REPO_BRANCH}/scripts/${ORGANIZATION}_${REPONAME}_postbuild.sh || true
                 if [ -f jenkins_postbuild_script.sh ]; then
                     chmod 755 jenkins_postbuild_script.sh
                     ./jenkins_postbuild_script.sh
@@ -233,12 +235,15 @@ pipeline {
                  returnStdout: true,
                  script: '#!/bin/bash \n' + 'source jenkinsjobinfo.sh; echo -n "${DNSREPONAME}"'
              )}"""
-
+                 PATH_TO_DOCS = """${sh(
+                 returnStdout: true,
+                 script: '#!/bin/bash \n' + 'source jenkinsjobinfo.sh; echo -n "${PATH_TO_DOCS}"'
+             )}"""
             }
 
             steps {
                 withAWS(region:'us-east-1', credentials: 'cppalliance-bot-aws-user') {
-                    s3Upload(bucket:"cppalliance-websites", path:"${BRANCH_NAME}.${DNSREPONAME}.cpp.al", workingDir: "boost-root/libs/${REPONAME}/doc/html", includePathPattern:"**")
+                    s3Upload(bucket:"cppalliance-websites", path:"${BRANCH_NAME}.${DNSREPONAME}.cpp.al", workingDir: "boost-root/${PATH_TO_DOCS}/html", includePathPattern:"**")
                 }
             }
         }
@@ -291,7 +296,7 @@ pipeline {
 
                     // Per-repo customizations
 
-                    if ( DIFF2HTML == "true" ) {
+                    if ( (env.DIFF2HTML != null) && (env.DIFF2HTML == "true") ) {
                         commenttext = commenttext + "\n\nDiff2html diff: [https://${env.CHANGE_ID}.${env.DNSREPONAME}.${env.PRTEST}.cppalliance.org/${PATH_TO_DOCS}/html/diff.html](https://${env.CHANGE_ID}.${env.DNSREPONAME}.${env.PRTEST}.cppalliance.org/${PATH_TO_DOCS}/html/diff.html)"
                     }
 

diff --git a/scripts/boostorg_boostlook_postbuild.sh b/scripts/boostorg_boostlook_postbuild.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -xe
+pwd
+sourcefile=boost-root/tools/boostlook/doc/html/specimen.html
+destfile=boost-root/tools/boostlook/doc/html/index.html
+
+if [ ! -f $destfile ]; then
+    cp $sourcefile $destfile
+fi
diff --git a/scripts/boostorg_boostlook_prebuild.sh b/scripts/boostorg_boostlook_prebuild.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -xe
+echo "export PRTEST=prtest2" >> jenkinsjobinfo.sh
+echo "export PATH_TO_DOCS=tools/boostlook/doc" >> jenkinsjobinfo.sh
diff --git a/scripts/sdarwin_crypt_prebuild.sh b/scripts/sdarwin_crypt_prebuild.sh