Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Wasta-Geek committed Feb 2, 2021
2 parents cc32147 + 69fe7d8 commit 3e711af
Show file tree
Hide file tree
Showing 16 changed files with 1,208 additions and 244 deletions.
43 changes: 43 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
variables:
ROS_DISTRO: melodic
ROS_LANG_DISABLE: genlisp:geneus:gennodejs
SKIPPED_KEYS: python-rpi.gpio python-flask

stages:
- build_n_test
# - build
# - test_pure_python
# - test_ros

catkin_make_n_rostest:
only:
refs:
- master
- develop
- tags
- schedules
- merge_requests

image: ros:${ROS_DISTRO}-ros-base-bionic
stage: build_n_test
script:
# updating apt cache
- apt-get update -y

# moving everything in src folder
- shopt -s extglob # Allow to use regex
- mkdir src # Create src folder
- mv !(src) src/

# Installing Python
- apt-get install -y python-dev python-pip

# Installing package dependencies
- rosdep update
- rosdep install --from-paths src --ignore-src --default-yes --rosdistro $ROS_DISTRO --skip-keys "$SKIPPED_KEYS"

- catkin_make
- source devel/setup.bash

# Tests
- python src/niryo_robot_unit_tests/scripts/script_test_headless.py
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ You can [download Niryo Studio](https://niryo.com/download/?utm_source=github) (

## Documentation link

You can find the whole generated documentation of this project at [Niryo Documentation](https://niryo.com/)
You can find the whole generated documentation of this project at [Niryo Documentation](https://www.docs.niryo.com/dev/ros/)
5 changes: 5 additions & 0 deletions sphinx_doc/_static/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function toggleMenu() {
var navBar = document.getElementById('navBar');
navBar.classList.toggle('togglemenu');
};

Empty file modified sphinx_doc/_static/favicon32.ico
100644 → 100755
Empty file.
Loading

0 comments on commit 3e711af

Please sign in to comment.