diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 85184a4b9f1a53156d83c1ab760067188eed9d62..73b2a3dfc870253f5ff3b3dc755c082fc530469c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,5 +1,6 @@ ################################################################################ # Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH +# 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # # This program and the accompanying materials are made available under the terms # of the Eclipse Public License 2.0 which is available at @@ -17,7 +18,7 @@ set(DOXYGEN_INTERACTIVE_SVG YES) set(DOXYGEN_QUIET YES) set(DOXYGEN_TAB_SIZE 2) set(DOXYGEN_UML_LOOK YES) -set(DOXYGEN_USE_MDFILE_AS_MAINPAGE README.md) +set(DOXYGEN_USE_MDFILE_AS_MAINPAGE ${PROJECT_SOURCE_DIR}/README.md) set(DOXYGEN_WARN_NO_PARAMDOC YES) set(DOXYGEN_WARN_LOGFILE ${CMAKE_CURRENT_BINARY_DIR}/DoxygenWarningLog.txt) set(DOXYGEN_GENERATE_LATEX NO) diff --git a/utils/ci/Jenkinsfile b/utils/ci/Jenkinsfile index 8fd81533ec76abdb143718d18b8b0a928bc099bf..f0a8fcfda81aeae2e2e9abd3036b1f1f08a6a924 100644 --- a/utils/ci/Jenkinsfile +++ b/utils/ci/Jenkinsfile @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2023-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -21,7 +21,7 @@ pipeline { stage('Linux') { agent { kubernetes { - label 'openpass-agent-pod-' + env.BUILD_NUMBER + inheritFrom 'openpass-agent-pod-' + env.BUILD_NUMBER yaml """ apiVersion: v1 kind: Pod @@ -76,7 +76,7 @@ spec: } stage('Windows') { agent { - label 'windows' + label 'windows10' } environment { MSYSTEM = 'MINGW64' @@ -87,23 +87,23 @@ spec: steps { bat 'subst M: %WORKSPACE%' dir('M:/') { - bat 'C:\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/10_build_prepare.sh' - bat 'C:\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/20_configure.sh' + bat 'C:\\op\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/10_build_prepare.sh' + bat 'C:\\op\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/20_configure.sh' } } } stage('Windows: Build MantleAPI') { steps { dir('M:/') { - bat 'C:\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/25_check_inline_docu.sh' - bat 'C:\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/30_build.sh' + bat 'C:\\op\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/25_check_inline_docu.sh' + bat 'C:\\op\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/30_build.sh' } } } stage('Windows: Run Unittest') { steps { dir('M:/') { - bat 'C:\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/40_test.sh' + bat 'C:\\op\\msys64\\usr\\bin\\bash -lc repo/utils/ci/scripts/40_test.sh' } } }