From d4926b1ea276a6c9201f004ff03ec04a3b840edc Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Wed, 21 Oct 2020 10:16:46 -0700
Subject: [PATCH] Cherry-pick #392 to sdf10: Move list of debian dependencies
 to packages.apt

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 .github/ci/packages.apt                   | 8 ++++++++
 .github/workflows/linux-ubuntu-bionic.yml | 7 ++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 .github/ci/packages.apt

diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
new file mode 100644
index 000000000..9596b3ee0
--- /dev/null
+++ b/.github/ci/packages.apt
@@ -0,0 +1,8 @@
+libignition-cmake2-dev
+libignition-math6-dev
+libignition-tools-dev
+libtinyxml2-dev
+liburdfdom-dev
+libxml2-utils
+python-psutil
+ruby-dev
diff --git a/.github/workflows/linux-ubuntu-bionic.yml b/.github/workflows/linux-ubuntu-bionic.yml
index 50a6f883e..de34e7ad5 100644
--- a/.github/workflows/linux-ubuntu-bionic.yml
+++ b/.github/workflows/linux-ubuntu-bionic.yml
@@ -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
@@ -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;