File tree 3 files changed +20
-0
lines changed
3 files changed +20
-0
lines changed Original file line number Diff line number Diff line change 51
51
- name : Sync eProsima/Fast-DDS repository
52
52
uses : eProsima/eProsima-CI/external/checkout@v0
53
53
with :
54
+ <<<<<<< HEAD
54
55
path : src/fastrtps
56
+ =======
57
+ path : src/fastdds
58
+ submodules : true
59
+ >>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
55
60
ref : ${{ inputs.fastdds-branch }}
56
61
57
62
- uses : eProsima/eProsima-CI/external/setup-python@v0
Original file line number Diff line number Diff line change 58
58
- name : Sync eProsima/Fast-DDS repository
59
59
uses : eProsima/eProsima-CI/external/checkout@v0
60
60
with :
61
+ <<<<<<< HEAD
61
62
path : src/fastrtps
63
+ =======
64
+ path : src/fastdds
65
+ submodules : true
66
+ >>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
62
67
ref : ${{ inputs.fastdds_ref }}
63
68
64
69
- name : Install Fix Python version
@@ -337,7 +342,12 @@ jobs:
337
342
- name : Sync eProsima/Fast-DDS repository
338
343
uses : eProsima/eProsima-CI/external/checkout@v0
339
344
with :
345
+ <<<<<<< HEAD
340
346
path : src/fastrtps
347
+ =======
348
+ path : src/fastdds
349
+ submodules : true
350
+ >>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
341
351
ref : ${{ inputs.fastdds_ref }}
342
352
343
353
- name : Install Fix Python version
Original file line number Diff line number Diff line change 86
86
- name : Sync eProsima/Fast-DDS repository
87
87
uses : eProsima/eProsima-CI/external/checkout@v0
88
88
with :
89
+ <<<<<<< HEAD
89
90
path : src/fastrtps
91
+ =======
92
+ path : src/fastdds
93
+ submodules : true
94
+ >>>>>>> 490e80b0 (Update submodules when cloning Fast DDS on CI (#5558))
90
95
ref : ${{ inputs.fastdds-branch }}
91
96
92
97
- name : Install Fix Python version
You can’t perform that action at this time.
0 commit comments