Skip to content

Commit 1954fc6

Browse files
Mario-DLmergify[bot]
authored andcommitted
Force Asio Thirdparty in MacOS CI (#5769)
* Force Asio Thirdparty in MacOS CI Signed-off-by: Mario Dominguez <[email protected]> * Nighties Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit c848baf) # Conflicts: # .github/workflows/nightly-mac-2.10.x.yml # .github/workflows/nightly-mac-2.14.x.yml # .github/workflows/nightly-mac-3.1.x.yml # .github/workflows/weekly-mac-2.6.x.yml
1 parent 274b356 commit 1954fc6

6 files changed

+92
-2
lines changed

.github/workflows/mac-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
label: ${{ inputs.label || 'mac-ci' }}
5353
colcon-args: ${{ inputs.colcon-args }}
54-
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
54+
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }} -DTHIRDPARTY_Asio=FORCE'
5555
ctest-args: ${{ inputs.ctest-args }}
5656
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '2.10.x' }}
5757
use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }}
+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Fast DDS MacOS CI (nightly 2.10.x)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 22 * * *' # At 22:00 GMT
7+
8+
jobs:
9+
nightly-mac-ci-2_10_x:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
security:
14+
- 'ON'
15+
- 'OFF'
16+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
17+
with:
18+
label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.10.x'
19+
cmake-args: "-DSECURITY=${{ matrix.security }} -DTHIRDPARTY_Asio=FORCE"
20+
ctest-args: "-LE xfail"
21+
fastdds-branch: '2.10.x'
22+
use-ccache: false
23+
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Fast DDS MacOS CI (nightly 2.14.x)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 22 * * *' # At 22:00 GMT
7+
8+
jobs:
9+
nightly-mac-ci-2_14_x:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
security:
14+
- 'ON'
15+
- 'OFF'
16+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
17+
with:
18+
label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.14.x'
19+
cmake-args: "-DSECURITY=${{ matrix.security }} -DTHIRDPARTY_Asio=FORCE"
20+
ctest-args: "-LE xfail"
21+
fastdds-branch: '2.14.x'
22+
use-ccache: false
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Fast DDS MacOS CI (nightly 3.1.x)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 22 * * *' # At 22:00 GMT
7+
8+
jobs:
9+
nightly-mac-ci-3_1_x:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
security:
14+
- 'ON'
15+
- 'OFF'
16+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
17+
with:
18+
label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.1.x'
19+
cmake-args: "-DSECURITY=${{ matrix.security }} -DTHIRDPARTY_Asio=FORCE"
20+
ctest-args: "-LE xfail"
21+
fastdds-branch: '3.1.x'
22+
use-ccache: false

.github/workflows/reusable-mac-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Install brew dependencies
6767
uses: eProsima/eProsima-CI/macos/install_brew_packages@v0
6868
with:
69-
packages: llvm asio tinyxml2 [email protected]
69+
packages: llvm tinyxml2 [email protected]
7070
update: false
7171
upgrade: false
7272

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Fast DDS MacOS CI (weekly 2.6.x)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 * * 1' # Run at minute 0 on Monday
7+
8+
jobs:
9+
10+
weekly-mac-ci-2_6_x:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
security:
15+
- 'ON'
16+
- 'OFF'
17+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
18+
with:
19+
label: 'weekly-sec-${{ matrix.security }}-mac-ci-2.6.x'
20+
cmake-args: "-DSECURITY=${{ matrix.security }} -DTHIRDPARTY_Asio=FORCE"
21+
ctest-args: "-LE xfail"
22+
fastdds-branch: '2.6.x'
23+
use-ccache: false

0 commit comments

Comments
 (0)