Skip to content

Commit

Permalink
3 ➡️ 4 (#101)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Aug 7, 2020
2 parents a946683 + fdf8618 commit 58cedf4
Show file tree
Hide file tree
Showing 22 changed files with 722 additions and 90 deletions.
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

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

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
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 }}
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
with:
codecov-token: ${{ secrets.CODECOV_TOKEN }}
50 changes: 50 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,32 @@

### Ignition Gui 3.X.X (202X-XX-XX)

### Ignition Gui 3.2.0 (2020-06-22)

1. Sort GUI plugins alphabetically
* [Pull request 71](https:/ignitionrobotics/ign-gui/pull/71)

1. Add color palette to plugin settings to change background color
* [Pull request 62](https:/ignitionrobotics/ign-gui/pull/62)

1. Close plugin menu after a plugin has been added
* [Pull request 60](https:/ignitionrobotics/ign-gui/pull/60)

1. Resize undocked plugins by dragging corners
* [Pull request 78](https:/ignitionrobotics/ign-gui/pull/78)

1. Move each plugin to its own directory
* [Pull request 64](https:/ignitionrobotics/ign-gui/pull/64)

1. Add Key Publisher plugin
* [Pull request 81](https:/ignitionrobotics/ign-gui/pull/81)

1. GitHub migration
* [Pull request 46](https:/ignitionrobotics/ign-gui/pull/46)
* [Pull request 47](https:/ignitionrobotics/ign-gui/pull/47)
* [Pull request 56](https:/ignitionrobotics/ign-gui/pull/56)
* [Pull request 57](https:/ignitionrobotics/ign-gui/pull/57)

### Ignition Gui 3.1.0 (2020-03-27)

1. Remove old ign-gui0 stuff
Expand Down Expand Up @@ -76,6 +102,30 @@

### Ignition Gui 2.X.X

### Ignition Gui 2.2.0 (2020-06-17)

1. Sort GUI plugins alphabetically
* [Pull request 71](https:/ignitionrobotics/ign-gui/pull/71)

1. Add color palette to plugin settings to change background color
* [Pull request 62](https:/ignitionrobotics/ign-gui/pull/62)

1. Close plugin menu after a plugin has been added
* [Pull request 60](https:/ignitionrobotics/ign-gui/pull/60)

1. Resize undocked plugins by dragging corners
* [Pull request 78](https:/ignitionrobotics/ign-gui/pull/78)

1. Move each plugin to its own directory
* [Pull request 64](https:/ignitionrobotics/ign-gui/pull/64)

1. GitHub migration
* [Pull request 46](https:/ignitionrobotics/ign-gui/pull/46)
* [Pull request 56](https:/ignitionrobotics/ign-gui/pull/56)

1. Fix homebrew warnings
* [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/249)


### Ignition Gui 2.1.0 (2020-03-04)

Expand Down
7 changes: 7 additions & 0 deletions examples/config/keypublisher.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>

<plugin filename="KeyPublisher">
</plugin>

<plugin filename="TopicEcho">
</plugin>
10 changes: 10 additions & 0 deletions examples/config/plugin_params.config
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,13 @@
</ignition-gui>
</plugin>

<plugin filename="Publisher">
<ignition-gui>
<title>Collapsed publisher</title>
<property key="width" type="double">250</property>
<property key="height" type="double">50</property>
<property key="state" type="string">docked_collapsed</property>
<property key="showCollapseButton" type="bool">true</property>
<property key="showTitleBar" type="bool">true</property>
</ignition-gui>
</plugin>
Loading

0 comments on commit 58cedf4

Please sign in to comment.