Skip to content

Commit ed65720

Browse files
committed
Switch CI to use octomap from package managers
1 parent 891a80c commit ed65720

File tree

4 files changed

+4
-22
lines changed

4 files changed

+4
-22
lines changed

.github/workflows/all_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
matrix:
3232
compiler: [gcc, clang]
3333
build: [Release, Debug]
34-
os: ['ubuntu-latest']
34+
os: ['ubuntu-20.04']
3535
uses: ./.github/workflows/generic_ci.yml
3636
with:
3737
install-name: 'install_linux.sh'

ci/install_linux.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,4 @@ sudo apt-get -qq update
33

44
sudo apt-get -qq --yes --force-yes install libeigen3-dev
55
sudo apt-get -qq --yes --force-yes install libccd-dev
6-
7-
# Octomap
8-
git clone https://github.com/OctoMap/octomap
9-
cd octomap
10-
git checkout tags/v1.8.0
11-
mkdir build
12-
cd build
13-
cmake ..
14-
make
15-
sudo make install
6+
sudo apt-get -qq --yes --force-yes install liboctomap-dev

ci/install_osx.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,4 @@ brew install git
44
brew install cmake
55
brew install eigen
66
brew install libccd
7-
8-
# Octomap
9-
git clone https://github.com/OctoMap/octomap
10-
cd octomap
11-
git checkout tags/v1.8.0
12-
mkdir build
13-
cd build
14-
cmake ..
15-
make
16-
sudo make install
7+
brew install octomap

test/narrowphase/detail/convexity_based_algorithm/test_gjk_libccd-inl_gjk_initializer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ GTEST_TEST(GjkLibccdSupportFunction, ConvexSupport) {
109109
// clang-format on
110110
const int kNumFaces = 6;
111111
const bool kThrowIfInvalid = true;
112-
const Convex<double> convex_C(move(vertices), kNumFaces, move(faces),
112+
const Convex<double> convex_C(std::move(vertices), kNumFaces, std::move(faces),
113113
kThrowIfInvalid);
114114

115115
/* Collection of arbitrary poses of the convex mesh: identity, translation,

0 commit comments

Comments
 (0)