Skip to content

Commit f5a4a16

Browse files
author
jparisu
committed
Refs #15841: Change gtest version
Signed-off-by: jparisu <[email protected]>
1 parent 5b7afb5 commit f5a4a16

File tree

4 files changed

+34
-43
lines changed

4 files changed

+34
-43
lines changed

.github/actions/fetch-fastdds-repos/action.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/actions/install-gtest/action.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/ci.repos

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
repositories:
2+
3+
foonathan_memory_vendor:
4+
type: git
5+
url: https://github.com/eProsima/foonathan_memory_vendor.git
6+
version: master
7+
8+
fastcdr:
9+
type: git
10+
url: https://github.com/eProsima/Fast-CDR.git
11+
version: master
12+
13+
fastdds:
14+
type: git
15+
url: https://github.com/eProsima/Fast-DDS.git
16+
version: master
17+
18+
googletest-distribution:
19+
type: git
20+
url: https://github.com/google/googletest.git
21+
version: release-1.12.1

.github/workflows/test.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,12 @@ jobs:
9494
- name: Install apt packages
9595
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages
9696

97-
- name: Install GTest
98-
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest
99-
10097
- name: Install Python packages
10198
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages
10299

103100
- name: Fetch eProsima dependencies
104-
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
101+
run: |
102+
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos
105103
106104
- name: Update colcon mixin
107105
run: |
@@ -110,10 +108,17 @@ jobs:
110108
colcon mixin update default
111109
continue-on-error: true
112110

111+
- name: Build gtest
112+
run: |
113+
colcon build \
114+
--event-handlers=console_direct+ \
115+
--packages-select googletest-distribution
116+
113117
- name: Build workspace
114118
run: |
115119
cat src/Fast-DDS-statistics-backend/.github/workflows/test.meta
116120
colcon build \
121+
--packages-skip googletest-distribution \
117122
--event-handlers=console_direct+ \
118123
--metas src/Fast-DDS-statistics-backend/.github/workflows/test.meta \
119124
--mixin coverage-gcc
@@ -185,14 +190,12 @@ jobs:
185190
- name: Install apt packages
186191
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages
187192

188-
- name: Install GTest
189-
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest
190-
191193
- name: Install Python packages
192194
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages
193195

194196
- name: Fetch eProsima dependencies
195-
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
197+
run: |
198+
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos
196199
197200
- name: Update colcon mixin
198201
run: |
@@ -241,14 +244,12 @@ jobs:
241244
- name: Install apt packages
242245
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages
243246

244-
- name: Install GTest
245-
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest
246-
247247
- name: Install Python packages
248248
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages
249249

250250
- name: Fetch eProsima dependencies
251-
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
251+
run: |
252+
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos
252253
253254
- name: Build workspace
254255
run: |

0 commit comments

Comments
 (0)