Support apt dependencies in a file

README.md

@@ -23,14 +23,22 @@ jobs:
         id: ci
         uses: ignition-tooling/ubuntu-bionic-ci-action@v1
         with:
-          apt-dependencies: ''
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
           cmake-args: '-DBUILD_TESTING=1'
 ```
 
 ### Dependencies
 
-Be sure to put all apt-installable dependencies into `apt-dependencies`.
+#### APT dependencies
+
+Be sure to declare all apt-installable dependencies in the following file, one
+package per line.
+
+`.github/ci-bionic/packages.apt`
+
+> The `apt-dependencies` input is deprecated.
+
+#### Source dependencies
 
 If you need to install dependencies from source, add a Vcstool yaml file to
 `.github/ci-bionic/dependencies.yaml`. Dependencies will be built using

entrypoint.sh

@@ -3,91 +3,127 @@
 set -x
 set -e
 
-APT_DEPENDENCIES=$1
+OLD_APT_DEPENDENCIES=$1
 CODECOV_TOKEN=$2
 CMAKE_ARGS=$3
 
-SOURCE_DEPENDENCIES=".github/ci-bionic/dependencies.yaml"
-SCRIPT_BEFORE_CMAKE="../.github/ci-bionic/before_cmake.sh"
-SCRIPT_BETWEEN_CMAKE_MAKE="../.github/ci-bionic/between_cmake_make.sh"
-SCRIPT_AFTER_MAKE="../.github/ci-bionic/after_make.sh"
-SCRIPT_AFTER_MAKE_TEST="../.github/ci-bionic/after_make_test.sh"
+SOURCE_DEPENDENCIES="`pwd`/.github/ci-bionic/dependencies.yaml"
+SCRIPT_BEFORE_CMAKE="`pwd`/.github/ci-bionic/before_cmake.sh"
+SCRIPT_BETWEEN_CMAKE_MAKE="`pwd`/.github/ci-bionic/between_cmake_make.sh"
+SCRIPT_AFTER_MAKE="`pwd`/.github/ci-bionic/after_make.sh"
+SCRIPT_AFTER_MAKE_TEST="`pwd`/.github/ci-bionic/after_make_test.sh"
 
 cd $GITHUB_WORKSPACE
 
+echo ::group::Install tools: apt
 apt update
 apt -y install wget lsb-release gnupg
 sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" > /etc/apt/sources.list.d/gazebo-stable.list'
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
-apt-get update
+apt-get update 2>&1
 apt -y install \
   cmake \
   build-essential \
   curl \
   g++-8 \
   git \
   cppcheck \
-  python3-pip \
-  $APT_DEPENDENCIES
+  python3-pip
+echo ::endgroup::
 
+echo ::group::Install tools: pip
 pip3 install -U pip vcstool colcon-common-extensions
+echo ::endgroup::
 
-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
-
-git clone https://github.com/linux-test-project/lcov.git -b v1.14
+echo ::group::Install tools: source
+git clone https://github.com/linux-test-project/lcov.git -b v1.14 2>&1
 cd lcov
 make install
 cd ..
+echo ::endgroup::
 
-sh tools/code_check.sh
+echo ::group::GCC 8
+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
+echo ::endgroup::
 
-echo ::group::Dependencies from source
+echo ::group::Fetch source dependencies
 if [ -f "$SOURCE_DEPENDENCIES" ] ; then
   mkdir -p deps/src
   cd deps
   vcs import src < ../.github/ci-bionic/dependencies.yaml
+  cd ..
+fi
+echo ::endgroup::
+
+echo ::group::Install dependencies from binaries
+apt -y install \
+  $OLD_APT_DEPENDENCIES \
+  $(sort -u $(find . -iname 'packages.apt') | tr '\n' ' ')
+echo ::endgroup::
+
+echo ::group::Compile dependencies from source
+if [ -f "$SOURCE_DEPENDENCIES" ] ; then
+  cd deps
   colcon build --symlink-install --merge-install --cmake-args -DBUILD_TESTING=false
   . install/setup.sh
   cd ..
 fi
+echo ::endgroup::
+
+echo ::group::Code check
+sh tools/code_check.sh 2>&1
+echo ::endgroup::
 
+echo ::group::Build folder
 mkdir build
 cd build
+echo ::endgroup::
 
 echo ::group::Script before cmake
 if [ -f "$SCRIPT_BEFORE_CMAKE" ] ; then
   . $SCRIPT_BEFORE_CMAKE
 fi
+echo ::endgroup::
 
+echo ::group::cmake
 if [ ! -z "$CODECOV_TOKEN" ] ; then
   cmake .. $CMAKE_ARGS -DCMAKE_BUILD_TYPE=coverage
 else
   cmake .. $CMAKE_ARGS
 fi
+echo ::endgroup::
 
 echo ::group::Script between cmake and make
 if [ -f "$SCRIPT_BETWEEN_CMAKE_MAKE" ] ; then
   . $SCRIPT_BETWEEN_CMAKE_MAKE 2>&1
 fi
+echo ::endgroup::
 
+echo ::group::make
 make
+echo ::endgroup::
 
 echo ::group::Script after make
 if [ -f "$SCRIPT_AFTER_MAKE" ] ; then
   . $SCRIPT_AFTER_MAKE 2>&1
 fi
+echo ::endgroup::
 
+echo ::group::make test
 export CTEST_OUTPUT_ON_FAILURE=1
 make test
+echo ::endgroup::
 
 echo ::group::Script after make test
 if [ -f "$SCRIPT_AFTER_MAKE_TEST" ] ; then
   . $SCRIPT_AFTER_MAKE_TEST 2>&1
 fi
+echo ::endgroup::
 
+echo ::group::codecov
 if [ ! -z "$CODECOV_TOKEN" ] ; then
   make coverage VERBOSE=1
 
@@ -96,3 +132,4 @@ if [ ! -z "$CODECOV_TOKEN" ] ; then
   # disable gcov output with `-X gcovout -X gcov`
   bash codecov.sh -t $CODECOV_TOKEN -X gcovout -X gcov
 fi
+echo ::endgroup::