Skip to content

Commit 031752b

Browse files
Force Asio Thirdparty in MacOS CI (#5769) (#5775)
* 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 * Fix conflicts Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> Co-authored-by: Mario Domínguez López <[email protected]> Co-authored-by: Mario Dominguez <[email protected]>
1 parent 274b356 commit 031752b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/mac-ci.yml

Lines changed: 1 addition & 1 deletion
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 }}

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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)