Check if python venv already exists in setup venv action (#114)

* Check if python venv already exists in setup venv action Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Set action branches references to current branch Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Activate virtual environment even if exists Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Set cmake-utils version to download Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Update versions.md Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Update artifacts name in README Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Set action branches references back to main Signed-off-by: Raul Sanchez-Mateos <[email protected]> --------- Signed-off-by: Raul Sanchez-Mateos <[email protected]>
eProsima · Jul 16, 2024 · 5591e76 · 5591e76
1 parent fbeeff2
commit 5591e76
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -187,34 +187,34 @@ So far, the following workflows are running to upload artifacts:
 These are the artifacts that are generated every night with the latest versions of each project:
 
 - Fast DDS
-  - build_fastdds_ubuntu-22.04_Debug_nightly
-  - build_fastdds_ubuntu-22.04_Release_nightly
-  - build_fastdds_ubuntu-24.04_Debug_nightly
-  - build_fastdds_ubuntu-24.04_Release_nightly
-  - build_fastdds_windows-2019_Debug_nightly
-  - build_fastdds_windows-2019_Release_nightly
-  - build_fastdds_windows-2022_Debug_nightly
-  - build_fastdds_windows-2022_Release_nightly
+  - build_fastdds_<fastdds-version>_ubuntu-22.04_Debug_nightly
+  - build_fastdds_<fastdds-version>_ubuntu-22.04_Release_nightly
+  - build_fastdds_<fastdds-version>_ubuntu-24.04_Debug_nightly
+  - build_fastdds_<fastdds-version>_ubuntu-24.04_Release_nightly
+  - build_fastdds_<fastdds-version>_windows-2019_Debug_nightly
+  - build_fastdds_<fastdds-version>_windows-2019_Release_nightly
+  - build_fastdds_<fastdds-version>_windows-2022_Debug_nightly
+  - build_fastdds_<fastdds-version>_windows-2022_Release_nightly
 
 - dev-utils
-  - build_dev_utils_ubuntu-22.04_Debug_nightly
-  - build_dev_utils_ubuntu-22.04_Release_nightly
-  - build_dev_utils_ubuntu-24.04_Debug_nightly
-  - build_dev_utils_ubuntu-24.04_Release_nightly
-  - build_dev_utils_windows-2019_Debug_nightly
-  - build_dev_utils_windows-2019_Release_nightly
-  - build_dev_utils_windows-2022_Debug_nightly
-  - build_dev_utils_windows-2022_Release_nightly
+  - build_dev_utils_<fastdds-version>_ubuntu-22.04_Debug_nightly
+  - build_dev_utils_<fastdds-version>_ubuntu-22.04_Release_nightly
+  - build_dev_utils_<fastdds-version>_ubuntu-24.04_Debug_nightly
+  - build_dev_utils_<fastdds-version>_ubuntu-24.04_Release_nightly
+  - build_dev_utils_<fastdds-version>_windows-2019_Debug_nightly
+  - build_dev_utils_<fastdds-version>_windows-2019_Release_nightly
+  - build_dev_utils_<fastdds-version>_windows-2022_Debug_nightly
+  - build_dev_utils_<fastdds-version>_windows-2022_Release_nightly
 
 - DDS Pipe
-  - build_ddspipe_ubuntu-22.04_Debug_nightly
-  - build_ddspipe_ubuntu-22.04_Release_nightly
-  - build_ddspipe_ubuntu-24.04_Debug_nightly
-  - build_ddspipe_ubuntu-24.04_Release_nightly
-  - build_ddspipe_windows-2019_Debug_nightly
-  - build_ddspipe_windows-2019_Release_nightly
-  - build_ddspipe_windows-2022_Debug_nightly
-  - build_ddspipe_windows-2022_Release_nightly
+  - build_ddspipe_<fastdds-version>_ubuntu-22.04_Debug_nightly
+  - build_ddspipe_<fastdds-version>_ubuntu-22.04_Release_nightly
+  - build_ddspipe_<fastdds-version>_ubuntu-24.04_Debug_nightly
+  - build_ddspipe_<fastdds-version>_ubuntu-24.04_Release_nightly
+  - build_ddspipe_<fastdds-version>_windows-2019_Debug_nightly
+  - build_ddspipe_<fastdds-version>_windows-2019_Release_nightly
+  - build_ddspipe_<fastdds-version>_windows-2022_Debug_nightly
+  - build_ddspipe_<fastdds-version>_windows-2022_Release_nightly
 
 In order to use one of these artifacts, use the following action as a step:
 

diff --git a/ubuntu/setup_python_venv/action.yml b/ubuntu/setup_python_venv/action.yml
@@ -22,9 +22,15 @@ runs:
 
         echo "::group::Setup Python virtual environment"
 
-        # Create a virtual environment
-        python3 -m venv ${{ inputs.path }}
-        source .venv/bin/activate
+        if [ -d "${{ inputs.path }}" ] && [ -f "${{ inputs.path }}/bin/activate" ]; then
+          echo "Virtual environment exists."
+        else
+          # Create a virtual environment
+          python3 -m venv ${{ inputs.path }}
+        fi
+
+        # Activate the virtual environment
+        source ${{ inputs.path }}/bin/activate
 
         if [ "${{ inputs.activate_global }}" = "true" ]; then
           echo PATH=$PATH >> $GITHUB_ENV

diff --git a/ubuntu/sphinx_docs/action.yml b/ubuntu/sphinx_docs/action.yml
@@ -50,6 +50,13 @@ inputs:
     required: false
     default: ''
 
+  custom_version_build:
+    description: >
+      Version of Fast DDS build from eProsima-CI.
+    required: false
+    type: string
+    default: 'v2'
+
 runs:
   using: composite
   steps:
@@ -70,7 +77,7 @@ runs:
     - name: Download cmake_utils artifact
       uses: eProsima/eProsima-CI/multiplatform/download_dependency@main
       with:
-        artifact_name: build_dev_utils_ubuntu-22.04_Release_nightly
+        artifact_name: build_dev_utils_${{ inputs.custom_version_build }}_ubuntu-22.04_Release_nightly
         workflow_source: build_dev_utils.yml
         workflow_source_repository: eProsima/eProsima-CI
         target_workspace: '${{ github.workspace }}/install'

diff --git a/versions.md b/versions.md
@@ -36,6 +36,9 @@ The [Forthcoming](#forthcoming) section includes those features added in `main`
 
 The upcoming release will include the following **features**:
 
+- Check if python venv already exists in `setup_python_venv` action.
+- Set cmake-utils version to download in `sphinx_docs` action.
+
 ## v0.22.0
 
 - Update nightly builds to compile on Ubuntu 24.04.