From 7838506d28e43588cd4f844cd5089245a4c88ec9 Mon Sep 17 00:00:00 2001 From: Irene Bandera Moreno Date: Fri, 13 Sep 2024 07:30:35 +0200 Subject: [PATCH] Update artifact name and compile on Ubuntu 24 (#91) * Fix ddspipe artifact name Signed-off-by: Irene Bandera * Add Ubuntu 24.04 and remove Ubuntu 20.04 Signed-off-by: Irene Bandera * Update forthcoming_version Signed-off-by: Irene Bandera * Remove yaml-cpp target library in fastddsspy tests package Signed-off-by: Irene Bandera --------- Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 2 +- .github/workflows/reusable-workflow.yml | 4 ++-- docs/rst/notes/forthcoming_version.rst | 5 +++++ fastddsspy_tool/test/application/CMakeLists.txt | 6 ++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index 50a47d54..dd5f1901 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -55,7 +55,7 @@ runs: - name: Download dependencies artifact uses: eProsima/eProsima-CI/multiplatform/download_dependency@v0 with: - artifact_name: built_ddspipe_${{ inputs.custom_version_build }}_${{ inputs.os }}_${{ inputs.cmake_build_type }}${{ inputs.dependencies_artifact_postfix }} + artifact_name: build_ddspipe_${{ inputs.custom_version_build }}_${{ inputs.os }}_${{ inputs.cmake_build_type }}${{ inputs.dependencies_artifact_postfix }} workflow_source: build_ddspipe.yml workflow_source_repository: eProsima/eProsima-CI target_workspace: ${{ inputs.target_workspace }} diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index 173138d9..ef99c429 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -1,7 +1,7 @@ # Reusable workflow to run the following jobs: # # - multiplatform-tests -# - [ ubuntu-22.04 | ubuntu-20.04 | windows-2019 | windows-2022 ] +# - [ ubuntu-22.04 | ubuntu-24.04 | windows-2019 | windows-2022 ] # - [ Debug | Release ] # - execute tests in different versions of ubuntu with different build types # @@ -72,8 +72,8 @@ jobs: - Release - Debug os: - - ubuntu-20.04 - ubuntu-22.04 + - ubuntu-24.04 - windows-2019 - windows-2022 diff --git a/docs/rst/notes/forthcoming_version.rst b/docs/rst/notes/forthcoming_version.rst index fce95803..36dced7e 100644 --- a/docs/rst/notes/forthcoming_version.rst +++ b/docs/rst/notes/forthcoming_version.rst @@ -7,6 +7,11 @@ Forthcoming Version ################### +This release includes the following **CI improvements**: + +* Upgrade to Ubuntu Noble (24.04). +* Remove Ubuntu Focal (20.04) from the CI. + This release includes the following **Configuration Features**: * New :ref:`domain argument ` to configure the ``domain`` through the command-line. diff --git a/fastddsspy_tool/test/application/CMakeLists.txt b/fastddsspy_tool/test/application/CMakeLists.txt index b08f0adb..74105e41 100644 --- a/fastddsspy_tool/test/application/CMakeLists.txt +++ b/fastddsspy_tool/test/application/CMakeLists.txt @@ -98,6 +98,12 @@ if(WIN32) string(REPLACE ";" "\\;" TEST_ENVIRONMENT "${TEST_ENVIRONMENT}") +else() + + # yaml-cpp changed its behavior in 0.8.0 (distributed in Ubuntu-24), so that the target changed from yaml-cpp to yaml-cpp::yaml-cpp . + # Instead of using each of these names depending on the OS, we simply remove it since it's actually not required. + string(REPLACE "$;" "" TEST_ENVIRONMENT "${TEST_ENVIRONMENT}") + endif(WIN32) # compile AdvanceConfigurationExample needed for tests