Skip to content

Commit ac3ac1c

Browse files
committed
Merge branch 'feat/rtems6.1' of rmc-github.robotic.dlr.de:common/libosal into feat/rtems6.1
2 parents 8348c38 + fcee4af commit ac3ac1c

3 files changed

Lines changed: 10 additions & 7 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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('rmc-jenkins-libraries-v2-no-changelog') _
1+
@Library('rmc-jenkins-libraries-v3') _
22
env.CONAN_V2_MODE=1
33
rmcBuild.auto()
44

@@ -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
"""

rmc-build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ builds:
44
- any:
55
coverage: False
66
- imports:
7-
- linux_defaults_build_profile
8-
- debian11-x86_64
9-
- build_profile:osl154-x86_64 pikeos4.2-armv7hf-gcc5:
7+
- linux_defaults
8+
- build_profile:osl155-x86_64 pikeos4.2-armv7hf-gcc5:
9+
- build_profile:osl155-x86_64 rtems6.1_zedboard-armv7le-gcc13

0 commit comments

Comments
 (0)