Driver: fix broken backslash continuation in DEB call, pass GUEZ_MODE to container
Run 3 exposed two driver bugs in the DEB step: - A '#' comment line placed inside the backslash-continued python3 invocation terminated the logical command early: python ran without --cmake_build_flags (hence the empty cmake flags and the recurring pdm_enums.hpp failure) and bash then tried to execute '--cmake_build_flags' as a command (exit 127). Moved the comment above the statement. - GUEZ_MODE was defaulted on the host but never passed to the container (-e GUEZ_MODE missing), so the DEB cmake flags expanded -DGUEZ_MODE= (empty -> false in CMake). Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
1 parent
62897fee66
commit
1646c5c71c
1 file changed
+6
-3
@@ -384,6 +384,7 @@ DOCKER_RUN_ARGS=(
|
|||||||
-e RUN_CTEST="${RUN_CTEST}"
|
-e RUN_CTEST="${RUN_CTEST}"
|
||||||
-e TESTS_ONLY="${TESTS_ONLY}"
|
-e TESTS_ONLY="${TESTS_ONLY}"
|
||||||
-e RUN_JENKINS_BUILDER="${RUN_JENKINS_BUILDER}"
|
-e RUN_JENKINS_BUILDER="${RUN_JENKINS_BUILDER}"
|
||||||
|
-e GUEZ_MODE="${GUEZ_MODE}"
|
||||||
-e PACKAGE_OUTPUT_DIR="${PACKAGE_OUTPUT_DIR}"
|
-e PACKAGE_OUTPUT_DIR="${PACKAGE_OUTPUT_DIR}"
|
||||||
-e LTS_VERSION="${LTS_VERSION}"
|
-e LTS_VERSION="${LTS_VERSION}"
|
||||||
-e PROJECT="${PROJECT}"
|
-e PROJECT="${PROJECT}"
|
||||||
@@ -603,15 +604,17 @@ if [[ "${RUN_JENKINS_BUILDER}" == "ON" ]]; then
|
|||||||
log_info " BUILD_NUMBER=${BUILD_NUMBER}"
|
log_info " BUILD_NUMBER=${BUILD_NUMBER}"
|
||||||
log_info " BUILD_TAG=${BUILD_TAG}"
|
log_info " BUILD_TAG=${BUILD_TAG}"
|
||||||
|
|
||||||
|
# DEB cmake flags: -DBUILD_RTI=ON is required - the full-tree DEB build
|
||||||
|
# compiles RTI codegen consumers (e.g. svcPdmCommon -> pdm_enums.hpp)
|
||||||
|
# whose BUILD_RTI=OFF stubs were removed as "forbidden OFF variants".
|
||||||
|
# (A '#' line inside a backslash-continued command breaks the continuation
|
||||||
|
# and drops the remaining arguments - keep comments outside it.)
|
||||||
cd "${STAGED_SOURCE_DIR}/rpmbuild"
|
cd "${STAGED_SOURCE_DIR}/rpmbuild"
|
||||||
if python3 make_rpm_ubuntu26_release2.py -c LTS \
|
if python3 make_rpm_ubuntu26_release2.py -c LTS \
|
||||||
--project_name "${PROJECT}" \
|
--project_name "${PROJECT}" \
|
||||||
--version "${LTS_VERSION}" \
|
--version "${LTS_VERSION}" \
|
||||||
--output_dir "${DOCKER_MOUNT_ROOT}/rpms/${PROJECT}/${OS_VERSION}/" \
|
--output_dir "${DOCKER_MOUNT_ROOT}/rpms/${PROJECT}/${OS_VERSION}/" \
|
||||||
--source_dir "${STAGED_SOURCE_DIR}" \
|
--source_dir "${STAGED_SOURCE_DIR}" \
|
||||||
# -DBUILD_RTI=ON is required: the full-tree DEB build compiles RTI
|
|
||||||
# codegen consumers (e.g. svcPdmCommon -> pdm_enums.hpp) whose
|
|
||||||
# BUILD_RTI=OFF stubs were removed as "forbidden OFF variants".
|
|
||||||
--cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DBUILD_RTI=ON -DRELEASE_BUILD=ON" \
|
--cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DBUILD_RTI=ON -DRELEASE_BUILD=ON" \
|
||||||
--build_number "${BUILD_NUMBER}" \
|
--build_number "${BUILD_NUMBER}" \
|
||||||
--release_scope; then
|
--release_scope; then
|
||||||
|
|||||||
Reference in new issue
Block a user