From a41da1f77a4d82fb7bd4375f7f637e632fe577ea Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Thu, 9 May 2024 14:27:29 +0200 Subject: [PATCH] Refs #20965: Add some comments Signed-off-by: Mario Dominguez --- .github/workflows/reusable-ubuntu-ci.yml | 2 ++ tools/fastdds/fastdds.bat | 2 ++ tools/fastdds/ros-discovery.bat | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index 2f4e5522446..6c3b1d59ff9 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -119,6 +119,8 @@ jobs: ref: ${{ steps.get_shapes_demo_branch.outputs.deduced_branch }} # Required for Shapes Demo + # Do not setup python as it will internally modify the pythonLocation env variable + # and we want to use a fix version - name: Install Qt uses: jurplel/install-qt-action@v2.13.0 with: diff --git a/tools/fastdds/fastdds.bat b/tools/fastdds/fastdds.bat index c6eeb708d5e..d796ffcae29 100644 --- a/tools/fastdds/fastdds.bat +++ b/tools/fastdds/fastdds.bat @@ -21,6 +21,7 @@ if not %ERRORLEVEL%==0 ( ) ) +:: Python version in the form "Major.Minor" if %PYTHON_VERSION%=="" ( echo error retrieving python version. Please, make sure python is installed and accessible. exit /B 65 @@ -28,4 +29,5 @@ if %PYTHON_VERSION%=="" ( ) :: Use launcher to profit from shebang hints on fastdds.py +:: Select the correct python version to source the appropriate paths py -%PYTHON_VERSION% "%dir%\..\tools\fastdds\fastdds.py" %args% diff --git a/tools/fastdds/ros-discovery.bat b/tools/fastdds/ros-discovery.bat index 950d366d3cf..26fee3900cf 100644 --- a/tools/fastdds/ros-discovery.bat +++ b/tools/fastdds/ros-discovery.bat @@ -21,6 +21,7 @@ if not %ERRORLEVEL%==0 ( ) ) +:: Python version in the form "Major.Minor" if %PYTHON_VERSION%=="" ( echo error retrieving python version. Please, make sure python is installed and accessible. exit /B 65 @@ -28,4 +29,5 @@ if %PYTHON_VERSION%=="" ( ) :: Use launcher to profit from shebang hints on fastdds.py +:: Select the correct python version to source the appropriate paths py -%PYTHON_VERSION% "%dir%\..\tools\fastdds\fastdds.py" discovery %args%