Skip to content

Commit

Permalink
Branch-out v3.0.0 (#4251)
Browse files Browse the repository at this point in the history
* Refs #19452: branch-out v3.0.0

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update XML schema name

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove doc legacy folder. Move github banner to resources folder

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove .settings folder

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove legacy m4 folder

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove legace files from utils folder

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: rename to FASTDDS_DEFAULT_PROFILES_FILE and FASTDDS_DEFAULT_PROFILES

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update XML Schema name

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update to Fast DDS, remove references to FastRTPS, remove legacy files

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update Doxygen modules

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: examples, use fastdds headers instead of fastrtps ones

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: rename security logging macros

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: use fastdds headers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update to fastdds headers in public headers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update to Fast DDS configuration files. Rename deprecation macro

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: use fastdds headers. Update header guards

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update fastrtps.rc

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove System deprecated class

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove DataWriter deprecated methods

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove deprecated methods in ServerAttributes

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove deprecated method in LocatorList

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove deprecated attributes in TCPTransportDescriptor

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove SampleInfo deprecated constexpr

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove deprecated participant discovery callback

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove TypeObject deprecated API

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove RPC headers deprecated API

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: rename project to Fast DDS. Update examples, tools and fuzzer CMakeLists. Changes required to build library after updating to fastdds headers

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: fix examples build

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: fixes in test suite

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove deprecated API

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update versions.md

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: fix Windows warning

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove PSM source files and tests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: move TopicAttributes implementation to src/cpp/rtps/attributes folder

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: sort alphabetically source files

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove Fast RTPS legacy API implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: remove PSM API headers and implementation. Fixes to ensure tests build correctly

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: update to libfastdds.version name and remove exported dds namespace

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: fixes after rebase

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: apply review suggestion related to XML header

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: missing XML xmlns

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: fixes in TCPv6 unit tests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: keep legacy installation folder until migration is completed

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #19452: fixes in TCPv4 unit tests

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19452: Remove Readme.html.in installation since it has been removed

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19452: Remove fastrtps_example.cpp references

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19452: Add head branch for discovery-server in github ci action

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs 19452: Update default branch for asan

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19452: Change Mac Github CI to work for 3.0.x-devel

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs 19452: Add namespace where missing

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com>

Fixes after rebase

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
  • Loading branch information
JLBuenoLopez committed Mar 11, 2024
1 parent bb6e749 commit 42c5589
Show file tree
Hide file tree
Showing 817 changed files with 3,831 additions and 40,270 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/address-sanitizers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '3.0.x-devel' }}

steps:
- name: Install apt packages
Expand All @@ -56,23 +56,23 @@ jobs:
with:
packages: vcstool setuptools gcovr tomark xmltodict jsondiff pandas

- name: Get fastrtps.repos file
- name: Get fastdds.repos file
uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
file_name: fastrtps.repos
file_result: fastrtps.repos
file_name: fastdds.repos
file_result: fastdds.repos

- name: Fetch Fast DDS & dependencies
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
with:
vcs_repos_file: fastrtps.repos
vcs_repos_file: fastdds.repos
destination_workspace: src

- name: Checkout Fast DDS branch
run: |
cd ./src/fastrtps
cd ./src/fastdds
git checkout ${{ env.FASTDDS_BRANCH }}
- name: Install GTest
Expand All @@ -82,16 +82,16 @@ jobs:

- name: Build workspace
run: |
cat src/fastrtps/.github/workflows/config/asan_colcon.meta
cat src/fastdds/.github/workflows/config/asan_colcon.meta
colcon build \
--event-handlers=console_direct+ \
--metas src/fastrtps/.github/workflows/config/asan_colcon.meta
--metas src/fastdds/.github/workflows/config/asan_colcon.meta
- name: Run tests Fast DDS
run: |
source install/setup.bash && \
colcon test \
--packages-select fastrtps \
--packages-select fastdds \
--event-handlers=console_direct+ \
--return-code-on-test-failure \
--ctest-args \
Expand All @@ -109,8 +109,8 @@ jobs:
- name: Report ASAN errors
if: always()
run: |
bash src/fastrtps/.github/workflows/utils/specific_errors_filter.sh "==ERROR:" log/latest_test/fastrtps/stdout_stderr.log _tmp_specific_error_file.log
python3 src/fastrtps/.github/workflows/utils/log_parser.py --log-file log/latest_test/fastrtps/stdout_stderr.log --specific-error-file _tmp_specific_error_file.log --output-file $GITHUB_STEP_SUMMARY --sanitizer asan
bash src/fastdds/.github/workflows/utils/specific_errors_filter.sh "==ERROR:" log/latest_test/fastdds/stdout_stderr.log _tmp_specific_error_file.log
python3 src/fastdds/.github/workflows/utils/log_parser.py --log-file log/latest_test/fastdds/stdout_stderr.log --specific-error-file _tmp_specific_error_file.log --output-file $GITHUB_STEP_SUMMARY --sanitizer asan
asan-discovery-server-test:
Expand All @@ -123,7 +123,7 @@ jobs:

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '3.0.x-devel' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || '3.0.x-devel' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.head_ref || github.event.inputs.discovery_server_branch || '3.0.x-devel' }}

steps:
- name: Install apt packages
Expand All @@ -139,23 +139,23 @@ jobs:
with:
packages: vcstool setuptools gcovr tomark xmltodict jsondiff pandas

- name: Get fastrtps.repos file
- name: Get fastdds.repos file
uses: eProsima/eProsima-CI/ubuntu/get_file_from_repo@v0
with:
source_repository: eProsima/Fast-DDS
source_repository_branch: ${{ env.FASTDDS_BRANCH }}
file_name: fastrtps.repos
file_result: fastrtps.repos
file_name: fastdds.repos
file_result: fastdds.repos

- name: Fetch Fast DDS & dependencies
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
with:
vcs_repos_file: fastrtps.repos
vcs_repos_file: fastdds.repos
destination_workspace: src

- name: Checkout Fast DDS branch
run: |
cd ./src/fastrtps
cd ./src/fastdds
git checkout ${{ env.FASTDDS_BRANCH }}
- name: Sync eProsima/Discovery-Server repository
Expand All @@ -172,10 +172,10 @@ jobs:

- name: Build workspace
run: |
cat src/fastrtps/.github/workflows/config/asan_colcon.meta
cat src/fastdds/.github/workflows/config/asan_colcon.meta
colcon build \
--event-handlers=console_direct+ \
--metas src/fastrtps/.github/workflows/config/asan_colcon.meta
--metas src/fastdds/.github/workflows/config/asan_colcon.meta
- name: Run tests Fast DDS
run: |
Expand All @@ -199,5 +199,5 @@ jobs:
- name: Report ASAN errors
if: always()
run: |
bash src/fastrtps/.github/workflows/utils/specific_errors_filter.sh "==ERROR:" log/latest_test/discovery-server/stdout_stderr.log _tmp_specific_error_file.log
python3 src/fastrtps/.github/workflows/utils/log_parser.py --log-file log/latest_test/discovery-server/stdout_stderr.log --specific-error-file _tmp_specific_error_file.log --output-file $GITHUB_STEP_SUMMARY --sanitizer=asan
bash src/fastdds/.github/workflows/utils/specific_errors_filter.sh "==ERROR:" log/latest_test/discovery-server/stdout_stderr.log _tmp_specific_error_file.log
python3 src/fastdds/.github/workflows/utils/log_parser.py --log-file log/latest_test/discovery-server/stdout_stderr.log --specific-error-file _tmp_specific_error_file.log --output-file $GITHUB_STEP_SUMMARY --sanitizer=asan
3 changes: 1 addition & 2 deletions .github/workflows/config/asan_colcon.meta
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"names":
{
"fastrtps":
"fastdds":
{
"cmake-args":
[
"-DCMAKE_BUILD_TYPE=Debug",
"-DEPROSIMA_BUILD_TESTS=ON",
"-DRTPS_API_TESTS=ON",
"-DFASTRTPS_API_TESTS=ON",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DNO_TLS=OFF",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/config/default_ci.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
names:
fastrtps:
fastdds:
cmake-args:
- "-DBUILD_DOCUMENTATION=OFF"
- "-DBUILD_SHARED_LIBS=ON"
Expand All @@ -20,7 +20,7 @@ names:
- "-DSTRICT_REALTIME=OFF"
- "-DSYSTEM_TESTS=ON"
- "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastdds/valgrind.supp"
googletest-distribution:
cmake-args:
- "-Dgtest_force_shared_crt=ON"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/config/documentation.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
names:
fastrtps:
fastdds:
cmake-args:
- "-DBUILD_SHARED_LIBS=ON"
- "-DSECURITY=ON"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/config/nightly.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
names:
fastrtps:
fastdds:
cmake-args:
- "-DBUILD_DOCUMENTATION=OFF"
- "-DBUILD_SHARED_LIBS=ON"
Expand All @@ -19,7 +19,7 @@ names:
- "-DSTRICT_REALTIME=OFF"
- "-DSYSTEM_TESTS=ON"
- "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastdds/valgrind.supp"
googletest-distribution:
cmake-args:
- "-Dgtest_force_shared_crt=ON"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/config/tsan_colcon.meta
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
"-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
]
},
"fastrtps":
"fastdds":
{
"cmake-args":
[
"-DCOMPILE_EXAMPLES=OFF",
"-DEPROSIMA_BUILD_TESTS=ON",
"-DRTPS_API_TESTS=ON",
"-DFASTRTPS_API_TESTS=OFF",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DNO_TLS=OFF",
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
submodules: true

- name: Get minimum supported version of CMake
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Download Fast DDS .repos
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
with:
vcs_repos_file: ./src/fastrtps/fastrtps.repos
vcs_repos_file: ./src/fastdds/fastdds.repos
destination_workspace: src
skip_existing: 'true'

Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: './src/fastrtps/.github/workflows/config/documentation.meta'
colcon_meta_file: './src/fastdds/.github/workflows/config/documentation.meta'
colcon_build_args: ''
colcon_build_args_default: ''
cmake_args: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS MacOS CI
name: Fast DDS MacOS CI

on:
workflow_dispatch:
Expand Down Expand Up @@ -26,7 +26,7 @@ on:

pull_request:
branches:
- 'master'
- '3.0.x-devel'
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
dest_branch:
- '2.14.x'
- '3.0.x'
steps:
- name: Mirror action step
id: mirror
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-mac-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS MacOS CI (nightly)
name: Fast DDS MacOS CI (nightly)

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS Ubuntu CI (nightly)
name: Fast DDS Ubuntu CI (nightly)

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS Windows CI (nightly)
name: Fast DDS Windows CI (nightly)

on:
workflow_dispatch:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/reusable-mac-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS MacOS CI reusable workflow
name: Fast DDS MacOS CI reusable workflow

on:
workflow_call:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
ref: ${{ inputs.fastdds-branch }}

- uses: eProsima/eProsima-CI/external/setup-python@v0
Expand Down Expand Up @@ -88,21 +88,21 @@ jobs:
# Nightly job
if [[ "${{ inputs.label }}" == *"nightly"* ]]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
if [ ! -f ${DEPENDS_REPOS_PATH} ]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_master.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/nightly_master.repos"
fi
META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
META_PATH="./src/fastdds/.github/workflows/config/nightly.meta"
# Either PR or manual
else
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
if [ ! -f ${DEPENDS_REPOS_PATH} ]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_master.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/default_ci_master.repos"
fi
META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
META_PATH="./src/fastdds/.github/workflows/config/default_ci.meta"
fi
echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
colcon_test_args_default: --event-handlers=console_direct+
ctest_args: ${{ inputs.ctest-args }}
ctest_args_default: --repeat until-pass:3 --timeout 300 --label-exclude "xfail"
packages_names: fastrtps
packages_names: fastdds
workspace: ${{ github.workspace }}
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/reusable-ubuntu-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS Ubuntu CI reusable workflow
name: Fast DDS Ubuntu CI reusable workflow

on:
workflow_call:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
ref: ${{ inputs.fastdds-branch }}

- name: Get minimum supported version of CMake
Expand Down Expand Up @@ -82,21 +82,21 @@ jobs:
# Nightly job
if [[ "${{ inputs.label }}" == *"nightly"* ]]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
if [ ! -f ${DEPENDS_REPOS_PATH} ]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_master.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/nightly_master.repos"
fi
META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
META_PATH="./src/fastdds/.github/workflows/config/nightly.meta"
# Either PR or manual
else
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
if [ ! -f ${DEPENDS_REPOS_PATH} ]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_master.repos"
DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/default_ci_master.repos"
fi
META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
META_PATH="./src/fastdds/.github/workflows/config/default_ci.meta"
fi
echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
colcon_test_args_default: --event-handlers=console_direct+
ctest_args: ${{ inputs.ctest-args }}
ctest_args_default: --repeat until-pass:3 --timeout 300 --label-exclude "xfail"
packages_names: fastrtps
packages_names: fastdds
workspace: ${{ github.workspace }}
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}

Expand Down
Loading

0 comments on commit 42c5589

Please sign in to comment.