Skip to content

Commit

Permalink
Update artifact name and compile on Ubuntu 24 (#123)
Browse files Browse the repository at this point in the history
* Fix artifact name in project_dependencies action

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Add Ubuntu 24.04 and remove Ubuntu 22.04

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Refactor TopicQoS::set_default_qos to use default values directly

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Update versions.md

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

* Update PLATFORM_SUPPORT

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>

---------

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
  • Loading branch information
irenebm authored Jul 18, 2024
1 parent cb8f7e1 commit 1402c3a
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/actions/project_dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ runs:
- name: Download dependencies artifact
uses: eProsima/eProsima-CI/multiplatform/download_dependency@v0
with:
artifact_name: built_dev_utils_${{ inputs.custom_version_build }}_${{ inputs.os }}_${{ inputs.cmake_build_type }}${{ inputs.dependencies_artifact_postfix }}
artifact_name: build_dev_utils_${{ inputs.custom_version_build }}_${{ inputs.os }}_${{ inputs.cmake_build_type }}${{ inputs.dependencies_artifact_postfix }}
workflow_source: build_dev_utils.yml
workflow_source_repository: eProsima/eProsima-CI
target_workspace: ${{ inputs.target_workspace }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# - execute tests in different versions of windows with different build types
#
# - ubuntu-multiplatform-tests
# - [ ubuntu-22.04 | ubuntu-20.04 ]
# - [ ubuntu-22.04 | ubuntu-24.04 ]
# - [ Debug | Release ]
# - execute tests in different versions of ubuntu with different build types
#
Expand Down Expand Up @@ -154,8 +154,8 @@ jobs:
- Release
- Debug
os:
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-24.04

steps:

Expand Down
4 changes: 2 additions & 2 deletions PLATFORM_SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ Community members may provide assistance with these platforms.

## Platforms

|Architecture|Ubuntu Focal (20.04)|Ubuntu Jammy (22.04)|Windows 10 (VS2019)|Windows 10 (VS2022)|Debian Buster (10)|
|Architecture|Ubuntu Jammy (22.04)|Ubuntu Noble (24.04)|Windows 10 (VS2019)|Windows 10 (VS2022)|Debian Buster (10)|
|------------|--------------------|--------------------|-------------------|-------------------|------------------|
|amd64 |Tier 1 |Tier 1 |Tier 1 |Tier 1 |Tier 3 |
|arm64 |Tier 3 | | | |Tier 3 |
|arm64 | | | | |Tier 3 |

## Compilers

Expand Down
11 changes: 1 addition & 10 deletions ddspipe_core/include/ddspipe_core/types/dds/TopicQoS.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,7 @@ TopicQoS
* @brief Set the default Topic QoS.
*/
DDSPIPE_CORE_DllAPI
void set_default_qos(
DurabilityKind durability_qos = DEFAULT_DURABILITY_QOS,
ReliabilityKind reliability_qos = DEFAULT_RELIABILITY_QOS,
OwnershipQosPolicyKind ownership_qos = DEFAULT_OWNERSHIP_QOS,
bool use_partitions = DEFAULT_USE_PARTITIONS,
bool keyed = DEFAULT_KEYED,
HistoryDepthType history_depth = DEFAULT_HISTORY_DEPTH,
float max_tx_rate = DEFAULT_MAX_TX_RATE,
float max_rx_rate = DEFAULT_MAX_RX_RATE,
unsigned int downsampling = DEFAULT_DOWNSAMPLING) noexcept;
void set_default_qos() noexcept;

/////////////////////////
// VARIABLES
Expand Down
30 changes: 10 additions & 20 deletions ddspipe_core/src/cpp/types/dds/TopicQoS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,27 +124,17 @@ void TopicQoS::set_qos(
}
}

void TopicQoS::set_default_qos(
DurabilityKind durability_qos /*= DEFAULT_DURABILITY_QOS */,
ReliabilityKind reliability_qos /*= DEFAULT_RELIABILITY_QOS */,
OwnershipQosPolicyKind ownership_qos /*= DEFAULT_OWNERSHIP_QOS */,
bool use_partitions /*= DEFAULT_USE_PARTITIONS */,
bool keyed /*= DEFAULT_KEYED */,
HistoryDepthType history_depth /*= DEFAULT_HISTORY_DEPTH */,
float max_tx_rate /*= DEFAULT_MAX_TX_RATE */,
float max_rx_rate /*= DEFAULT_MAX_RX_RATE */,
unsigned int downsampling /*= DEFAULT_DOWNSAMPLING */) noexcept
void TopicQoS::set_default_qos() noexcept
{
// The default values must be received as arguments. Otherwise, Ubuntu 20.04 Debug does not compile.
this->durability_qos.set_value(durability_qos, utils::FuzzyLevelValues::fuzzy_level_default);
this->reliability_qos.set_value(reliability_qos, utils::FuzzyLevelValues::fuzzy_level_default);
this->ownership_qos.set_value(ownership_qos, utils::FuzzyLevelValues::fuzzy_level_default);
this->use_partitions.set_value(use_partitions, utils::FuzzyLevelValues::fuzzy_level_default);
this->history_depth.set_value(history_depth, utils::FuzzyLevelValues::fuzzy_level_default);
this->keyed.set_value(keyed, utils::FuzzyLevelValues::fuzzy_level_default);
this->max_tx_rate.set_value(max_tx_rate, utils::FuzzyLevelValues::fuzzy_level_default);
this->max_rx_rate.set_value(max_rx_rate, utils::FuzzyLevelValues::fuzzy_level_default);
this->downsampling.set_value(downsampling, utils::FuzzyLevelValues::fuzzy_level_default);
this->durability_qos.set_value(DEFAULT_DURABILITY_QOS, utils::FuzzyLevelValues::fuzzy_level_default);
this->reliability_qos.set_value(DEFAULT_RELIABILITY_QOS, utils::FuzzyLevelValues::fuzzy_level_default);
this->ownership_qos.set_value(DEFAULT_OWNERSHIP_QOS, utils::FuzzyLevelValues::fuzzy_level_default);
this->use_partitions.set_value(DEFAULT_USE_PARTITIONS, utils::FuzzyLevelValues::fuzzy_level_default);
this->history_depth.set_value(DEFAULT_HISTORY_DEPTH, utils::FuzzyLevelValues::fuzzy_level_default);
this->keyed.set_value(DEFAULT_KEYED, utils::FuzzyLevelValues::fuzzy_level_default);
this->max_tx_rate.set_value(DEFAULT_MAX_TX_RATE, utils::FuzzyLevelValues::fuzzy_level_default);
this->max_rx_rate.set_value(DEFAULT_MAX_RX_RATE, utils::FuzzyLevelValues::fuzzy_level_default);
this->downsampling.set_value(DEFAULT_DOWNSAMPLING, utils::FuzzyLevelValues::fuzzy_level_default);
}

std::ostream& operator <<(
Expand Down
4 changes: 4 additions & 0 deletions versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The *Forthcoming* section includes those features added in `main` branch that ar

## Forthcoming

The upcoming release will include the following features:
* Support Ubuntu Noble (24.04).
* Stop supporting Ubuntu Focal (20.04).

## eProsima DDS Pipe v0.4.0

This release includes the following *new features*:
Expand Down

0 comments on commit 1402c3a

Please sign in to comment.