Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests on actions #98

Merged
merged 5 commits into from
Aug 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/ci-bionic/after_make.sh

This file was deleted.

16 changes: 16 additions & 0 deletions .github/ci/after_make.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/sh -l

set -x

# Install (needed for some tests)
make install
mjcarroll marked this conversation as resolved.
Show resolved Hide resolved

# For ign-tools
export IGN_CONFIG_PATH=/usr/local/share/ignition
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH

# 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
23 changes: 23 additions & 0 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
libignition-cmake2-dev
libignition-common3-dev
libignition-math6-dev
libignition-msgs4-dev
libignition-plugin-dev
libignition-rendering2-dev
libignition-tools-dev
libignition-transport7-dev
libprotobuf-dev
libprotoc-dev
libtinyxml2-dev
qml-module-qt-labs-folderlistmodel
qml-module-qt-labs-settings
qml-module-qtgraphicaleffects
qml-module-qtquick-controls
qml-module-qtquick-controls2
qml-module-qtquick-dialogs
qml-module-qtquick-layouts
qml-module-qtquick2
qtbase5-dev
qtdeclarative5-dev
qtquickcontrols2-5-dev
xvfb
18 changes: 0 additions & 18 deletions .github/workflows/ci-bionic.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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 }}
4 changes: 2 additions & 2 deletions src/ign_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ std::string custom_exec_str(std::string _cmd)
TEST(CmdLine, list)
{
std::string output = custom_exec_str("ign gui -l");
EXPECT_NE(output.find("TopicEcho"), std::string::npos);
EXPECT_NE(output.find("Publisher"), std::string::npos);
EXPECT_NE(output.find("TopicEcho"), std::string::npos) << output;
EXPECT_NE(output.find("Publisher"), std::string::npos) << output;
}

3 changes: 0 additions & 3 deletions src/plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ function(ign_gui_add_plugin plugin_name)
PRIVATE_LINK_LIBS ${ign_gui_add_plugin_PRIVATE_LINK_LIBS} ignition-plugin${IGN_PLUGIN_VER}::register
)

message(STATUS "ddddddddddddddddddddddddddddddddddddddddd")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful.

message(STATUS ${ign_gui_add_plugin_TEST_SOURCES})
if(ign_gui_add_plugin_TEST_SOURCES)
message(STATUS "aaaaaaaaaaaaaaaaaaaaaaaaaaaa")
ign_build_tests(TYPE UNIT
SOURCES
${ign_gui_add_plugin_TEST_SOURCES}
Expand Down