Skip to content

Commit

Permalink
Cherry-pick #392 to master: Move list of debian dependencies to packa…
Browse files Browse the repository at this point in the history
…ges.apt

Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
chapulina committed Oct 31, 2020
1 parent 9c5f750 commit 1eb6b9a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
libignition-cmake2-dev
libignition-math6-dev
libignition-tools-dev
libtinyxml2-dev
liburdfdom-dev
libxml2-utils
python-psutil
ruby-dev
7 changes: 2 additions & 5 deletions .github/workflows/linux-ubuntu-bionic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" > /etc/apt/sources.list.d/gazebo-stable.list';
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2486D2DD83DB69272AFE98867170598AF249743;
sudo apt-get update;
sudo apt -y install cmake build-essential curl g++-8 git mercurial libtinyxml2-dev libxml2-utils ruby-dev python-psutil cppcheck;
sudo apt -y install cmake build-essential curl g++-8 git cppcheck;
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8;
# workaround for https://github.com/rubygems/rubygems/issues/3068
# suggested in https://github.com/rubygems/rubygems/issues/3068#issuecomment-574775885
Expand All @@ -32,10 +32,7 @@ jobs:
- name: Install ignition dependencies
run: |
sudo apt -y install \
libignition-cmake2-dev \
libignition-math6-dev \
libignition-tools-dev \
liburdfdom-dev;
$(sort -u $(find .github -iname 'packages-'`lsb_release -cs`'.apt' -o -iname 'packages.apt') | tr '\n' ' ')
- name: cmake
run: |
mkdir build;
Expand Down

0 comments on commit 1eb6b9a

Please sign in to comment.