Skip to content

Commit 1c89811

Browse files
Update artifact name and compile on Ubuntu 24 (#463)
* Fix ddspipe artifact name Signed-off-by: Irene Bandera <irenebandera@eprosima.com> * Add Ubuntu 24.04 and remove Ubuntu 20.04 Signed-off-by: Irene Bandera <irenebandera@eprosima.com> * Update PLATFORM_SUPPORT.md Signed-off-by: Irene Bandera <irenebandera@eprosima.com> * Update forthcoming_version Signed-off-by: Irene Bandera <irenebandera@eprosima.com> * Remove yaml-cpp target library in ddsrouter tests package (#471) Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Irene Bandera <irenebandera@eprosima.com> Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> Co-authored-by: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com>
1 parent d0ab4cb commit 1c89811

5 files changed

Lines changed: 18 additions & 7 deletions

File tree

.github/actions/project_dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ runs:
5454
- name: Download dependencies artifact
5555
uses: eProsima/eProsima-CI/multiplatform/download_dependency@v0
5656
with:
57-
artifact_name: built_ddspipe_${{ inputs.custom_version_build }}_${{ inputs.os }}_${{ inputs.cmake_build_type }}${{ inputs.dependencies_artifact_postfix }}
57+
artifact_name: build_ddspipe_${{ inputs.custom_version_build }}_${{ inputs.os }}_${{ inputs.cmake_build_type }}${{ inputs.dependencies_artifact_postfix }}
5858
workflow_source: build_ddspipe.yml
5959
workflow_source_repository: eProsima/eProsima-CI
6060
target_workspace: ${{ inputs.target_workspace }}

.github/workflows/reusable-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Reusable workflow to run the following jobs:
22
#
33
# - multiplatform-tests
4-
# - [ ubuntu-22.04 | ubuntu-20.04 | windows-2019 | windows-2022 ]
4+
# - [ ubuntu-22.04 | ubuntu-24.04 | windows-2019 | windows-2022 ]
55
# - [ Debug | Release ]
66
# - execute tests in different versions of ubuntu with different build types
77
#
@@ -77,8 +77,8 @@ jobs:
7777
- Release
7878
- Debug
7979
os:
80-
- ubuntu-20.04
8180
- ubuntu-22.04
81+
- ubuntu-24.04
8282
- windows-2019
8383
- windows-2022
8484

PLATFORM_SUPPORT.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ Community members may provide assistance with these platforms.
3131

3232
## Platforms
3333

34-
|Architecture|Ubuntu Focal (20.04)|Ubuntu Jammy (22.04)|Windows 10 (VS2019)|Windows 10 (VS2022)|Debian Buster (10)|
35-
|------------|--------------------|--------------------|-------------------|-------------------|------------------|
36-
|amd64 |Tier 1 |Tier 1 |Tier 1 |Tier 1 |Tier 3 |
37-
|arm64 |Tier 3 | | | |Tier 3 |
34+
|Architecture|Ubuntu Focal (20.04)|Ubuntu Jammy (22.04)|Ubuntu Noble (24.04)|Windows 10 (VS2019)|Windows 10 (VS2022)|Debian Buster (10)|
35+
|------------|--------------------|--------------------|--------------------|-------------------|-------------------|------------------|
36+
|amd64 | |Tier 1 |Tier 1 |Tier 1 |Tier 1 |Tier 3 |
37+
|arm64 |Tier 3 | | | | |Tier 3 |
3838

3939
## Compilers
4040

docs/rst/notes/forthcoming_version.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
Forthcoming Version
77
###################
88

9+
This release includes the following **CI improvements**:
10+
11+
* Upgrade to Ubuntu Noble (24.04).
12+
* Remove Ubuntu Focal (20.04) from the CI.
13+
914
This release includes the following **Bugfixes**:
1015

1116
* Reset cache changes before returning them to the pool.

tools/ddsrouter_tool/test/application/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ if(WIN32)
9696

9797
string(REPLACE ";" "\\;" TEST_ENVIRONMENT "${TEST_ENVIRONMENT}")
9898

99+
else()
100+
101+
# 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 .
102+
# Instead of using each of these names depending on the OS, we simply remove it since it's actually not required.
103+
string(REPLACE "$<TARGET_FILE_DIR:yaml-cpp>;" "" TEST_ENVIRONMENT "${TEST_ENVIRONMENT}")
104+
99105
endif(WIN32)
100106

101107
# populate the tests

0 commit comments

Comments
 (0)