Skip to content

Commit

Permalink
Remove local conan server config (#606)
Browse files Browse the repository at this point in the history
* Remove local conan server config

This is now automated in the Jenkins shared library.

* Force build b2 in Jenkins job

* Update build node versions

* Update build nodes used in tasks

* Roll back documentation os setting in Jenkins

* Fix name in README

* Update documentation generation in Jenkinfile

* Enable coverage in Jenkins job

* Disable coverage in Jenkins build again
  • Loading branch information
amues authored Aug 2, 2022
1 parent fb16c66 commit 2c40d09
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 22 deletions.
29 changes: 8 additions & 21 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ import ecdcpipeline.ContainerBuildNode
import ecdcpipeline.PipelineBuilder

project = "h5cpp"
// coverage_os = "centos7-release"
coverage_os = "None"
// documentation_os = "debian10-release"
documentation_os = "ubuntu2004-release"
documentation_os = "ubuntu2204-release"

container_build_nodes = [
'centos7': ContainerBuildNode.getDefaultContainerBuildNode('centos7-gcc8'),
'centos7-release': ContainerBuildNode.getDefaultContainerBuildNode('centos7-gcc8'),
'debian10': ContainerBuildNode.getDefaultContainerBuildNode('debian10'),
'debian10-release': ContainerBuildNode.getDefaultContainerBuildNode('debian10'),
'debian10-release-hdf5-1.12': ContainerBuildNode.getDefaultContainerBuildNode('debian10'),
'ubuntu2004': ContainerBuildNode.getDefaultContainerBuildNode('ubuntu2004'),
'ubuntu2004-release': ContainerBuildNode.getDefaultContainerBuildNode('ubuntu2004')
'debian11': ContainerBuildNode.getDefaultContainerBuildNode('debian11'),
'debian11-release': ContainerBuildNode.getDefaultContainerBuildNode('debian11'),
'debian11-release-hdf5-1.12': ContainerBuildNode.getDefaultContainerBuildNode('debian11'),
'ubuntu2204': ContainerBuildNode.getDefaultContainerBuildNode('ubuntu2204'),
'ubuntu2204-release': ContainerBuildNode.getDefaultContainerBuildNode('ubuntu2204')
]

// Define number of old builds to keep. These numbers are somewhat arbitrary,
Expand Down Expand Up @@ -58,17 +56,6 @@ builders = pipeline_builder.createBuilders { container ->
container.copyTo(pipeline_builder.project, pipeline_builder.project)
} // stage

pipeline_builder.stage("${container.key}: Configure Conan") {
def conan_remote = "ess-dmsc-local"
container.sh """
mkdir build
cd build
conan remote add \
--insert 0 \
${conan_remote} ${local_conan_server}
"""
} // stage

pipeline_builder.stage("${container.key}: CMake") {
def cmake_options
def cmake_prefix
Expand Down Expand Up @@ -108,7 +95,9 @@ builders = pipeline_builder.createBuilders { container ->
}

container.sh """
mkdir build
cd build
conan install --build b2 --build missing b2/4.8.0@
cmake --version
${cmake_prefix} cmake ${cmake_options} ../${pipeline_builder.project}
"""
Expand Down Expand Up @@ -175,8 +164,6 @@ builders = pipeline_builder.createBuilders { container ->
if (container.key == documentation_os) {
pipeline_builder.stage("Documentation") {
container.sh """
pip3 --proxy=${http_proxy} install --user sphinx==4.0.3 breathe
export PATH=$PATH:~/.local/bin:/bin
cd build
make html
"""
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ We currently support:
* Windows
* macOS

Although this and [Steve Vagras' h5cpp project](https://github.com/steven-varga/h5cpp)
Although this and [Steven Varga's h5cpp project](https://github.com/steven-varga/h5cpp)
share the same name they are entirely unrelated.

## How to use *h5cpp*
Expand Down

0 comments on commit 2c40d09

Please sign in to comment.