Skip to content

Commit fcee4af

Browse files
committed
build: docs generation with conan2
Signed-off-by: stel_ma <Martin.Stelzer@dlr.de>
1 parent 5b03d0a commit fcee4af

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

Makefile.doc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SOURCEDIR = ./
77
BUILDDIR = $(SOURCEDIR)/docs
88
GH_PAGES_DIR_NAME = gh-pages
99
BRANCH_DIR_NAME = $(subst /,_,$(BRANCH_NAME))
10-
BUILDCMD = cissy run -c $(SOURCEDIR) -p doxygen/[~=1.8]@3rdparty/stable doxygen
10+
BUILDCMD = cissy run -c $(SOURCEDIR) -p doxygen/1.10.0@3rdparty/stable doxygen
1111
DOCS = "$(GH_PAGES_DIR_NAME)/$(BRANCH_DIR_NAME)"
1212

1313
.PHONY: Makefile.doc gh-pages

RMC-Jenkinsfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ node('default') {
88
context.getGitRepo().checkout()
99
sshagent(credentials: [context.getConfig().gitCredentialsId]) {
1010
lock("gh-pages-${context.getGitRepo().getOrganization()}-${context.getGitRepo().getName()}") {
11-
sh """
12-
export CONAN_USER_HOME=${pwd()}/conan_home
11+
sh """#!/bin/bash
12+
set +x
13+
source /opt/rmc-build-tools/sourceme-devel.sh --cissy /opt/rmc-build-tools/any/cissy2/
14+
set -x
15+
export CONAN_HOME=${pwd()}/conan_home
1316
cd repo_dir
1417
make -f Makefile.doc gh-pages
1518
"""

0 commit comments

Comments
 (0)