Skip to content

Commit 9051468

Browse files
Mario-DLMario-DL
committed
Revert "TODO: REMOVE THIS COMMIT. (Dis)Enable workflows for windows testing"
This reverts commit 7c4b08c.
1 parent 7c4b08c commit 9051468

File tree

5 files changed

+214
-13
lines changed

5 files changed

+214
-13
lines changed

‎.github/workflows/mac-ci.yml

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Fast DDS MacOS CI
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
label:
7+
description: 'ID associated to the workflow'
8+
required: true
9+
type: string
10+
colcon-args:
11+
description: 'Extra arguments for colcon cli'
12+
required: false
13+
type: string
14+
cmake-args:
15+
description: 'Extra arguments for cmake cli'
16+
required: false
17+
type: string
18+
ctest-args:
19+
description: 'Extra arguments for ctest cli'
20+
required: false
21+
type: string
22+
fastdds_branch:
23+
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
24+
type: string
25+
required: true
26+
use-ccache:
27+
description: 'Use CCache to speed up the build'
28+
required: false
29+
type: boolean
30+
default: false
31+
32+
pull_request:
33+
types:
34+
- review_requested
35+
paths-ignore:
36+
- '**.md'
37+
- '**.txt'
38+
- '!**/CMakeLists.txt'
39+
40+
concurrency:
41+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
42+
cancel-in-progress: true
43+
44+
jobs:
45+
mac-ci:
46+
if: ${{ (
47+
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
48+
!contains(github.event.pull_request.labels.*.name, 'conflicts')
49+
) }}
50+
uses: ./.github/workflows/reusable-mac-ci.yml
51+
with:
52+
label: ${{ inputs.label || 'mac-ci' }}
53+
colcon-args: ${{ inputs.colcon-args }}
54+
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
55+
ctest-args: ${{ inputs.ctest-args }}
56+
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
57+
use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }}

‎.github/workflows/nightly-windows-22592.yml renamed to ‎.github/workflows/nightly-windows-master.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
name: Fast DDS Windows CI (nightly)
22

33
on:
4-
pull_request:
5-
types:
6-
- review_requested
7-
paths-ignore:
8-
- '**.md'
9-
- '**.txt'
10-
- '!**/CMakeLists.txt'
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 22 * * *' # At 22:00 GMT
117

128
jobs:
13-
nightly-windows-ci-fix22592:
14-
name: nightly-windows-ci-fix22592 (${{ matrix.cmake_build_type }}, SEC=${{ matrix.security }}, ${{ matrix.test_filter }})
9+
nightly-windows-ci-master:
10+
name: nightly-windows-ci-master (${{ matrix.cmake_build_type }}, SEC=${{ matrix.security }}, ${{ matrix.test_filter }})
1511
strategy:
1612
fail-fast: false
1713
matrix:
@@ -26,10 +22,10 @@ jobs:
2622
- 'unittest'
2723
filter_expression:
2824
- 'BlackboxTests|example_tests|ParticipantTests|SecureDiscoverServer'
29-
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@fix/22592
25+
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master
3026
with:
31-
label: nightly-sec-${{ matrix.security }}-${{ matrix.cmake_build_type }}-${{ matrix.test_filter }}-windows-ci-fix22592
27+
label: nightly-sec-${{ matrix.security }}-${{ matrix.cmake_build_type }}-${{ matrix.test_filter }}-windows-ci-master
3228
cmake-config: ${{ matrix.cmake_build_type }}
3329
cmake-args: "-DSECURITY=${{ matrix.security }}"
3430
ctest-args: -LE xfail ${{ matrix.test_filter == 'blackbox' && format('-R "{0}"', matrix.filter_expression) || format('-E "{0}" -j 4', matrix.filter_expression) }}
35-
fastdds_branch: 'fix/22592'
31+
fastdds_branch: 'master'

‎.github/workflows/sanitizers-ci.yml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Fast DDS Sanitizers CI
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
label:
7+
description: 'ID associated to the workflow'
8+
required: true
9+
type: string
10+
run_asan_fastdds:
11+
description: 'Run Addess Sanitizer job for Fast DDS'
12+
required: false
13+
type: boolean
14+
run_asan_discovery_server:
15+
description: 'Run Addess Sanitizer job for Discovery Server'
16+
required: false
17+
type: boolean
18+
run_tsan_fastdds:
19+
description: 'Run Thread Sanitizer job for Fast DDS'
20+
required: false
21+
type: boolean
22+
colcon_build_args:
23+
description: 'Optional colcon build arguments'
24+
required: false
25+
type: string
26+
colcon_test_args:
27+
description: 'Optional colcon test arguments'
28+
required: false
29+
type: string
30+
cmake_args:
31+
description: 'Optional CMake Compilation Flags'
32+
required: false
33+
type: string
34+
ctest_args:
35+
description: 'Optional CTest Testing Flags'
36+
required: false
37+
type: string
38+
fastdds_ref:
39+
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
40+
required: true
41+
discovery_server_ref:
42+
description: >
43+
Branch or tag of Discovery Server repository (https://github.com/eProsima/Discovery-Server)
44+
Required only if the Discovery Server job is requested
45+
required: false
46+
47+
pull_request:
48+
types:
49+
- review_requested
50+
paths-ignore:
51+
- '**.md'
52+
- '**.txt'
53+
- '!**/CMakeLists.txt'
54+
55+
concurrency:
56+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
57+
cancel-in-progress: true
58+
59+
jobs:
60+
sanitizers-ci:
61+
if: ${{ (
62+
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
63+
!contains(github.event.pull_request.labels.*.name, 'no-test') &&
64+
!contains(github.event.pull_request.labels.*.name, 'conflicts')
65+
) }}
66+
uses: ./.github/workflows/reusable-sanitizers-ci.yml
67+
with:
68+
label: ${{ inputs.label || 'fastdds-sanitizers-ci' }}
69+
run_asan_fastdds: ${{ ((inputs.run_asan_fastdds == true) && true) || github.event_name == 'pull_request' }}
70+
run_asan_discovery_server: ${{ ((inputs.run_asan_discovery_server == true) && true) || github.event_name == 'pull_request' }}
71+
run_tsan_fastdds: ${{ ((inputs.run_tsan_fastdds == true) && true) || github.event_name == 'pull_request' }}
72+
colcon_build_args: ${{ inputs.colcon_build_args || '' }}
73+
colcon_test_args: ${{ inputs.colcon_test_args || '' }}
74+
cmake_args: ${{ inputs.cmake_args || '' }}
75+
ctest_args: ${{ inputs.ctest_args || '' }}
76+
fastdds_ref: ${{ inputs.fastdds_ref || github.ref || 'master' }}
77+
discovery_server_ref: ${{ inputs.discovery_server_ref || 'master' }}

‎.github/workflows/ubuntu-ci.yml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Fast DDS Ubuntu CI
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
label:
7+
description: 'ID associated to the workflow'
8+
required: true
9+
type: string
10+
colcon-args:
11+
description: 'Extra arguments for colcon cli'
12+
required: false
13+
type: string
14+
cmake-args:
15+
description: 'Extra arguments for cmake cli'
16+
required: false
17+
type: string
18+
ctest-args:
19+
description: 'Extra arguments for ctest cli'
20+
required: false
21+
type: string
22+
fastdds_branch:
23+
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
24+
type: string
25+
required: true
26+
security:
27+
description: 'Enable security features'
28+
required: false
29+
type: boolean
30+
default: true
31+
run-tests:
32+
description: 'Run suite of tests of Fast DDS, Fast DDS python, and Fast DDS Discovery Server'
33+
required: false
34+
type: boolean
35+
default: true
36+
use-ccache:
37+
description: 'Use CCache to speed up the build'
38+
required: false
39+
type: boolean
40+
default: false
41+
42+
pull_request:
43+
types:
44+
- review_requested
45+
paths-ignore:
46+
- '**.md'
47+
- '**.txt'
48+
- '!**/CMakeLists.txt'
49+
50+
concurrency:
51+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
52+
cancel-in-progress: true
53+
54+
jobs:
55+
ubuntu-ci:
56+
57+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
58+
uses: ./.github/workflows/reusable-ubuntu-ci.yml
59+
with:
60+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
61+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
62+
os-image: 'ubuntu-22.04'
63+
label: ${{ inputs.label || 'ubuntu-ci' }}
64+
colcon-args: ${{ inputs.colcon-args }}
65+
cmake-args: ${{ inputs.cmake-args }}
66+
ctest-args: ${{ inputs.ctest-args || '-LE xfail' }}
67+
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
68+
security: ${{ ((inputs.security == true) && true) || github.event_name == 'pull_request' }}
69+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
70+
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }}
71+
use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }}
72+
add-label: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.repository) && true || false }}

‎test/blackbox/api/dds-pim/PubSubParticipant.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ class PubSubParticipant
189189
else if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT ||
190190
status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT)
191191
{
192-
std::cout << "Participant removedd !!" << std::endl;
193192
--participant_->matched_;
194193
participant_->cv_discovery_.notify_one();
195194
}

0 commit comments

Comments
 (0)