Skip to content

Commit

Permalink
Refs #15841: Change gtest version
Browse files Browse the repository at this point in the history
Signed-off-by: jparisu <javierparis@eprosima.com>
  • Loading branch information
jparisu committed Oct 10, 2022
1 parent 5b7afb5 commit 56aa95a
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 46 deletions.
10 changes: 0 additions & 10 deletions .github/actions/fetch-fastdds-repos/action.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/install-gtest/action.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/ci.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repositories:

foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: master

fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: master

fastdds:
type: git
url: https://github.com/eProsima/Fast-DDS.git
version: master

googletest-distribution:
type: git
url: https://github.com/google/googletest.git
version: release-1.12.1
25 changes: 13 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,12 @@ jobs:
- name: Install apt packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages

- name: Install GTest
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest

- name: Install Python packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages

- name: Fetch eProsima dependencies
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
run: |
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos
- name: Update colcon mixin
run: |
Expand All @@ -110,10 +108,17 @@ jobs:
colcon mixin update default
continue-on-error: true

- name: Build gtest
run: |
colcon build \
--event-handlers=console_direct+ \
--packages-select googletest-distribution
- name: Build workspace
run: |
cat src/Fast-DDS-statistics-backend/.github/workflows/test.meta
colcon build \
--packages-skip googletest-distribution \
--event-handlers=console_direct+ \
--metas src/Fast-DDS-statistics-backend/.github/workflows/test.meta \
--mixin coverage-gcc
Expand Down Expand Up @@ -185,14 +190,12 @@ jobs:
- name: Install apt packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages

- name: Install GTest
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest

- name: Install Python packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages

- name: Fetch eProsima dependencies
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
run: |
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos
- name: Update colcon mixin
run: |
Expand Down Expand Up @@ -241,14 +244,12 @@ jobs:
- name: Install apt packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages

- name: Install GTest
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest

- name: Install Python packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages

- name: Fetch eProsima dependencies
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
run: |
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos
- name: Build workspace
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/database/database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@ bool Database::is_entity_present(
auto result = get_entity(entity_id);
return result.operator bool();
}
catch(const BadParameter& e)
catch(const BadParameter&)
{
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>

#include <boost/interprocess/sync/interprocess_mutex.hpp>

#include <fastdds/dds/core/status/StatusMask.hpp>
#include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
#include <fastrtps/types/TypesBase.h>
Expand Down

0 comments on commit 56aa95a

Please sign in to comment.