From 34f1bd113facd298b229a14f00d1ad47e3f42b77 Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Fri, 25 Oct 2024 22:05:08 +0000 Subject: [PATCH 1/3] ignore rmw_implementation for industrial to avoid missing zenoh error if used --- .gitlab-ci/docker-ros.yml | 1 + action.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitlab-ci/docker-ros.yml b/.gitlab-ci/docker-ros.yml index 3f22462..6d2a99b 100644 --- a/.gitlab-ci/docker-ros.yml +++ b/.gitlab-ci/docker-ros.yml @@ -169,6 +169,7 @@ run-arm64: .test: variables: + RMW_IMPLEMENTATION: rmw_cyclonedds_cpp # avoid missing rmw_zenoh_cpp errors, if used UPSTREAM_WORKSPACE: ${BUILD_CONTEXT}/.repos TARGET_WORKSPACE: ${BUILD_CONTEXT} ADDITIONAL_DEBS: git diff --git a/action.yml b/action.yml index 6dbbd89..6ec7556 100644 --- a/action.yml +++ b/action.yml @@ -226,6 +226,7 @@ runs: if: ${{ inputs.enable-industrial-ci == 'true' }} uses: ros-industrial/industrial_ci@master env: + RMW_IMPLEMENTATION: rmw_cyclonedds_cpp # avoid missing rmw_zenoh_cpp errors, if used UPSTREAM_WORKSPACE: ${{ inputs.build-context }}/.repos TARGET_WORKSPACE: ${{ inputs.build-context }} ADDITIONAL_DEBS: git From a85cd034eb374b1a4019cba970d8f5157a996e0d Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Fri, 25 Oct 2024 22:57:51 +0000 Subject: [PATCH 2/3] fix zenoh in industrial ci --- .gitlab-ci/docker-ros.yml | 2 +- action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/docker-ros.yml b/.gitlab-ci/docker-ros.yml index 6d2a99b..d41f7db 100644 --- a/.gitlab-ci/docker-ros.yml +++ b/.gitlab-ci/docker-ros.yml @@ -169,7 +169,7 @@ run-arm64: .test: variables: - RMW_IMPLEMENTATION: rmw_cyclonedds_cpp # avoid missing rmw_zenoh_cpp errors, if used + UNDERLAY: /opt/ws_rmw_zenoh/install UPSTREAM_WORKSPACE: ${BUILD_CONTEXT}/.repos TARGET_WORKSPACE: ${BUILD_CONTEXT} ADDITIONAL_DEBS: git diff --git a/action.yml b/action.yml index 6ec7556..3b01dd6 100644 --- a/action.yml +++ b/action.yml @@ -226,7 +226,7 @@ runs: if: ${{ inputs.enable-industrial-ci == 'true' }} uses: ros-industrial/industrial_ci@master env: - RMW_IMPLEMENTATION: rmw_cyclonedds_cpp # avoid missing rmw_zenoh_cpp errors, if used + UNDERLAY: /opt/ws_rmw_zenoh/install UPSTREAM_WORKSPACE: ${{ inputs.build-context }}/.repos TARGET_WORKSPACE: ${{ inputs.build-context }} ADDITIONAL_DEBS: git From 6519f2aed8b8e8e8ba2f785e84f7b58fe81f42b7 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Busch Date: Sat, 26 Oct 2024 10:52:32 +0200 Subject: [PATCH 3/3] only set UNDERLAY if required --- .gitlab-ci/docker-ros.yml | 5 ++++- action.yml | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/docker-ros.yml b/.gitlab-ci/docker-ros.yml index d41f7db..b8fc461 100644 --- a/.gitlab-ci/docker-ros.yml +++ b/.gitlab-ci/docker-ros.yml @@ -169,7 +169,6 @@ run-arm64: .test: variables: - UNDERLAY: /opt/ws_rmw_zenoh/install UPSTREAM_WORKSPACE: ${BUILD_CONTEXT}/.repos TARGET_WORKSPACE: ${BUILD_CONTEXT} ADDITIONAL_DEBS: git @@ -184,6 +183,10 @@ run-arm64: fi - git clone --branch master --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci - test -f ${BUILD_CONTEXT}/.repos || echo "repositories:" > ${BUILD_CONTEXT}/.repos + - |- + if [ "$RMW_IMPLEMENTATION" = "rmw_zenoh_cpp" ]; then + export UNDERLAY="/opt/ws_rmw_zenoh/install" + fi script: .industrial_ci/gitlab.sh Test dev-amd64: diff --git a/action.yml b/action.yml index 3b01dd6..fefef44 100644 --- a/action.yml +++ b/action.yml @@ -226,11 +226,10 @@ runs: if: ${{ inputs.enable-industrial-ci == 'true' }} uses: ros-industrial/industrial_ci@master env: - UNDERLAY: /opt/ws_rmw_zenoh/install UPSTREAM_WORKSPACE: ${{ inputs.build-context }}/.repos TARGET_WORKSPACE: ${{ inputs.build-context }} ADDITIONAL_DEBS: git - AFTER_INIT_EMBED: '[[ -n ${{ inputs.git-https-server }} ]] && git config --global url.https://${{ inputs.git-https-user }}:${{ inputs.git-https-password }}@${{ inputs.git-https-server }}.insteadOf https://${{ inputs.git-https-server }}' + AFTER_INIT_EMBED: '[[ "$RMW_IMPLEMENTATION" == "rmw_zenoh_cpp" ]] && export UNDERLAY="/opt/ws_rmw_zenoh/install" ; [[ -n ${{ inputs.git-https-server }} ]] && git config --global url.https://${{ inputs.git-https-user }}:${{ inputs.git-https-password }}@${{ inputs.git-https-server }}.insteadOf https://${{ inputs.git-https-server }}' SSH_PRIVATE_KEY: ${{ inputs.git-ssh-private-key }} SSH_SERVER_HOSTKEYS: ${{ inputs.git-ssh-known-host-keys }} DOCKER_RUN_OPTS: -u root:root