Improve Windows merge meta files action (#116)

* Refs #21387: Remove windows merge metas action Signed-off-by: JesusPoderoso <[email protected]> * Refs #21387: Update colcon build action to avoid double quotes on colcon meta arg Signed-off-by: JesusPoderoso <[email protected]> --------- Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jul 22, 2024 · 24a29a0 · 24a29a0
1 parent fd1852b
commit 24a29a0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -157,11 +157,6 @@ For more information about versioning handle of this project, check following [f
 - [setup_python_venv](ubuntu/setup_python_venv/action.yml)
   - Setup a Python virtual environment and add it to the PATH.
 
-### Windows
-
-- [merge_yaml_metas](windows/merge_yaml_metas/action.yml)
-  - Merge a set of yaml meta files into a single meta file
-
 ### macOS
 
 - [install_brew_packages](macos/install_brew_packages/action.yml)

diff --git a/versions.md b/versions.md
@@ -37,6 +37,9 @@ The [Forthcoming](#forthcoming) section includes those features added in `main`
 
 The upcoming release will include the following **features**:
 
+- Fix the windows action colcon build to accept multiple colcon meta files.
+- Remove the windows action merge yaml meta files.
+
 ## v0.23.0
 
 - Check if python venv already exists in `setup_python_venv` action.

diff --git a/windows/colcon_build/action.yml b/windows/colcon_build/action.yml
@@ -4,9 +4,9 @@ description: Use colcon build command to build multiple packages
 inputs:
 
   colcon_meta_file:
-    description: colcon.meta file to set cmake options. If empty, it uses an empty file
+    description: colcon.meta file to set cmake options. If empty, it uses a non-existing file
     required: false
-    default: ''
+    default: '__invalid.meta'
 
   colcon_build_args:
     description: Arguments to pass to colcon build command (use cmake_args input for CMake options)
@@ -57,14 +57,7 @@ runs:
           ${{ inputs.workspace_dependencies }}/setup.ps1
         }
 
-        if ([string]::IsNullOrEmpty("${{ inputs.colcon_meta_file }}")) {
-          New-Item -ItemType File "${{ inputs.workspace }}\colcon.meta"
-          $env:COLCON_BUILD_META_ = "${{ inputs.workspace }}\colcon.meta"
-        } else {
-          $env:COLCON_BUILD_META_ = "${{ inputs.colcon_meta_file }}"
-        }
-
-        echo "Using colcon.meta file <$env:COLCON_BUILD_META_>"
+        echo "Using colcon.meta file(s) <${{ inputs.colcon_meta_file }}>"
 
         cd ${{ inputs.workspace }}
 
@@ -77,16 +70,10 @@ runs:
           -StartInPath (pwd) -DevCmdArguments '/arch=x64 /host_arch=x64'
 
         colcon build `
-          --metas $env:COLCON_BUILD_META_ `
+          --metas ${{ inputs.colcon_meta_file }} `
           ${{ inputs.colcon_build_args_default }} `
           ${{ inputs.colcon_build_args }} `
           --cmake-args `
             -DCMAKE_BUILD_TYPE=${{ inputs.cmake_build_type }} ${{ inputs.cmake_args_default }} ${{ inputs.cmake_args }}
 
-        cd -
-
-        if ([string]::IsNullOrEmpty("${{ inputs.colcon_meta_file }}")) {
-          Remove-Item -Path "${{ inputs.workspace }}\colcon.meta"
-        }
-
         "::endgroup::"
diff --git a/windows/merge_yaml_metas/action.yml b/windows/merge_yaml_metas/action.yml