ci (jenkins): disable windows documentation builds (#80)

vectorgrp · Jul 18, 2024 · 84445e1 · 84445e1
1 parent a2b78d1
commit 84445e1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,9 +33,6 @@ option(SILKIT_BUILD_TESTS "Enable unit and integration tests for the SIL Kit" ON
 option(SILKIT_BUILD_UTILITIES "Build the SIL Kit utility tools" ON)
 option(SILKIT_BUILD_DOCS "Build documentation for the SIL Kit (requires Doxygen and Sphinx)" OFF)
 option(SILKIT_INSTALL_SOURCE "Install and package the source tree" OFF)
-if(SILKIT_INSTALL_SOURCE)
-    set(SILKIT_BUILD_DOCS ON CACHE BOOL "Force SILKIT_BUILD_DOCS ON due to SILKIT_INSTALL_SOURCE" FORCE)
-endif()
 option(SILKIT_ENABLE_ASAN "Enable -f sanitize=address for builds (requires gcc, clang,  VS2019)" OFF)
 option(SILKIT_ENABLE_UBSAN "Enable -f sanitize=undefined for builds (requires gcc, clang)" OFF)
 option(SILKIT_ENABLE_THREADSAN "Enable -f sanitize=thread for builds (requires gcc, clang)" OFF)

diff --git a/SilKit/ci/Jenkinsfile b/SilKit/ci/Jenkinsfile
@@ -31,7 +31,6 @@ def buildConfigs = [
         MsvcVersion:"14.1",
         PublishArtifacts: true,
         CmakePreset: "vs141-x64-release",
-        BuildDocs: true,
     ]
     ,[
         Name: "VS2017-Win32",
@@ -40,7 +39,6 @@ def buildConfigs = [
         MsvcVersion:"14.1",
         PublishArtifacts: true,
         CmakePreset: "vs141-x86-release",
-        BuildDocs: true,
     ]
 
     // Linux builds:
@@ -138,8 +136,8 @@ def isFullBuildRequired(branchName) {
     if(branchName == 'main-mirror' || branchName.startsWith("PR-")) {
         return true;
     }
-    // A user requests a fullbuild by adding a "/full" suffix
-    if(branchName.contains("/full")) {
+    // A user requests a fullbuild by adding a "-full" suffix
+    if(branchName.contains("-full")) {
         return true;
     }
     return false
@@ -385,6 +383,8 @@ def doBuild(Map config) {
         }
         if(buildDocs) {
             buildCmakeArgs +=" -DSILKIT_BUILD_DOCS=ON "
+        }
+        if(publishArtifacts || buildDocs) {
             buildCmakeArgs +=" -DSILKIT_INSTALL_SOURCE=ON "
         }
 
@@ -399,22 +399,28 @@ def doBuild(Map config) {
                 run("cmake --version")
             }
             stage("${buildName}: cmake configure for preset ${buildPreset}") {
-                    // Install dependencies for documentation
-                    configFileProvider([
-                        configFile(fileId: 'PYPI_MIRROR', variable: 'PYPI_MIRROR'),
-                    ]) {
-                        def pypiMirror = readFile(file: PYPI_MIRROR).trim()
-                        print("Using pipenv to install docs dependencies")
-                        if(!isUnix()) {
-                            run("python -m pip install pipenv==2022.9.8")
+                    if(buildDocs) {
+                        // Install dependencies for documentation
+                        configFileProvider([
+                            configFile(fileId: 'PYPI_MIRROR', variable: 'PYPI_MIRROR'),
+                        ]) {
+                            def pypiMirror = readFile(file: PYPI_MIRROR).trim()
+                            print("Using pipenv to install docs dependencies")
+                            if(!isUnix()) {
+                                run("python -m pip install pipenv==2022.9.8")
+                            }
+                            run("python -m pipenv install --pypi-mirror  ${pypiMirror} -r SilKit/ci/docker/docs_requirements.txt")
                         }
-                        run("python -m pipenv install --pypi-mirror  ${pypiMirror} -r SilKit/ci/docker/docs_requirements.txt")
                     }
                     run("cmake --preset ${buildPreset} ${buildCmakeArgs}")
             }
 
             stage("${buildName}: cmake build for preset ${buildPreset}") {
-                run("python -m pipenv run cmake --build --preset ${buildPreset}")
+                if(buildDocs) {
+                    run("python -m pipenv run cmake --build --preset ${buildPreset}")
+                } else {
+                    run("cmake --build --preset ${buildPreset}")
+                }
             }
 
             stage("${buildName}: ctest for preset ${buildPreset}") {