build: catch2 is installed with using conan instead of FetchContent

henryborchers · henryborchers · commit b07013cb0dd5 · 2025-12-16T10:57:41.000-06:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -331,7 +331,12 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPipCa
                                                     archiveArtifacts artifacts: 'dist/*.whl'
                                                 } finally{
                                                     sh "${tool(name: 'Default', type: 'git')} clean -dfx"
-                                                    sh "docker rmi \$(docker images -q ${dockerImageName})"
+                                                    sh(
+                                                        label:'untagging image',
+                                                        script: """if [[ ! -z $(docker images -q ${dockerImageName}) ]]; then
+                                                                      docker rmi ${dockerImageName}
+                                                                   fi
+                                                                """)
                                                 }
                                             }
                                         }

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,12 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPipCa`
`331`	`331`	`archiveArtifacts artifacts: 'dist/*.whl'`
`332`	`332`	`} finally{`
`333`	`333`	`sh "${tool(name: 'Default', type: 'git')} clean -dfx"`
`334`		`- sh "docker rmi \$(docker images -q ${dockerImageName})"`
	`334`	`+ sh(`
	`335`	`+ label:'untagging image',`
	`336`	`+ script: """if [[ ! -z $(docker images -q ${dockerImageName}) ]]; then`
	`337`	`+ docker rmi ${dockerImageName}`
	`338`	`+ fi`
	`339`	`+ """)`
`335`	`340`	`}`
`336`	`341`	`}`
`337`	`342`	`}`