From 3ae4654df7e8fdc38564882aa18feaf6810b8d70 Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Thu, 6 Aug 2020 08:44:46 -0700
Subject: [PATCH] Modernize actions CI (#269)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 .github/ci-bionic/after_make.sh |  6 ------
 .github/ci/after_make.sh        | 15 +++++++++++++++
 .github/ci/packages.apt         | 16 ++++++++++++++++
 .github/workflows/ci-bionic.yml | 17 -----------------
 .github/workflows/ci.yml        | 16 ++++++++++++++++
 5 files changed, 47 insertions(+), 23 deletions(-)
 delete mode 100644 .github/ci-bionic/after_make.sh
 create mode 100644 .github/ci/after_make.sh
 create mode 100644 .github/ci/packages.apt
 delete mode 100644 .github/workflows/ci-bionic.yml
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/ci-bionic/after_make.sh b/.github/ci-bionic/after_make.sh
deleted file mode 100644
index c35a06fad4..0000000000
--- a/.github/ci-bionic/after_make.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -l
-
-set -x
-
-# Install
-make install
diff --git a/.github/ci/after_make.sh b/.github/ci/after_make.sh
new file mode 100644
index 0000000000..a3b79b0ae9
--- /dev/null
+++ b/.github/ci/after_make.sh
@@ -0,0 +1,15 @@
+#!/bin/sh -l
+
+set -x
+
+# Install (needed for some tests)
+make install
+
+# For ign-tools
+export IGN_CONFIG_PATH=/usr/local/share/ignition
+
+# For rendering / window tests
+Xvfb :1 -screen 0 1280x1024x24 &
+export DISPLAY=:1.0
+export RENDER_ENGINE_VALUES=ogre2
+export MESA_GL_VERSION_OVERRIDE=3.3
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
new file mode 100644
index 0000000000..23a9b4e9cf
--- /dev/null
+++ b/.github/ci/packages.apt
@@ -0,0 +1,16 @@
+libgflags-dev
+libignition-cmake2-dev
+libignition-common3-dev
+libignition-fuel-tools3-dev
+libignition-gui2-dev
+libignition-math6-eigen3-dev
+libignition-msgs4-dev
+libignition-physics-dev
+libignition-plugin-dev
+libignition-rendering2-dev
+libignition-sensors2-dev
+libignition-tools-dev
+libignition-transport7-dev
+libsdformat8-dev
+qml-module-qtqml-models2
+xvfb
diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml
deleted file mode 100644
index 95a4f21ccf..0000000000
--- a/.github/workflows/ci-bionic.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Ubuntu Bionic CI
-
-on: [push, pull_request]
-
-jobs:
-  bionic-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Bionic CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Bionic CI
-        id: ci
-        uses: ignition-tooling/ubuntu-bionic-ci-action@master
-        with:
-          apt-dependencies: 'libignition-cmake2-dev libignition-common3-dev libignition-gui3-dev libignition-math6-eigen3-dev libignition-msgs5-dev libignition-plugin-dev libignition-rendering3-dev libignition-tools-dev libignition-transport8-dev libsdformat9-dev libignition-fuel-tools4-dev libignition-physics2-dev libignition-sensors3-dev qml-module-qtqml-models2'
-          codecov-token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..cea1ae9e85
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+name: Ubuntu CI
+
+on: [push]
+
+jobs:
+  bionic-ci:
+    runs-on: ubuntu-latest
+    name: Ubuntu Bionic CI
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Compile and test
+        id: ci
+        uses: ignition-tooling/action-ignition-ci@master
+        with:
+          codecov-token: ${{ secrets.CODECOV_TOKEN }}