diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..1054df5f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +on: [push] + +jobs: + catkin-build: + runs-on: ubuntu-latest + steps: + - name: checkout repo + uses: actions/checkout@v1 + with: + fetch-depth: 1 + id: checkout + - name: build image + run: docker build -t godel . + - name: image details + run: docker images + diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 25ad6c8d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -sudo: required -dist: trusty -language: generic -compiler: - - gcc -notifications: - email: - on_success: change - on_failure: always -env: - global: - - ROS_DISTRO=kinetic - - UPSTREAM_WORKSPACE=file - - ROSINSTALL_FILENAME=godel.rosinstall - - NOT_TEST_INSTALL=true - - BEFORE_SCRIPT='catkin config -w $CATKIN_WORKSPACE --no-install' - matrix: - - ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu -install: - - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -script: - - source .ci_config/travis.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..fca1ded6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,19 @@ +from ros:kinetic + +ENV PYTHONIOENCODING=UTF-8 \ + CATKIN_WS=/catkin_ws + +RUN apt-get update && apt-get install -y \ + python-pip \ + && rm -rf /var/lib/apt/lists/* + +RUN pip install catkin_tools wstool + +COPY ./ /$CATKIN_WS/src/godel +WORKDIR /$CATKIN_WS + +RUN wstool init --shallow src src/godel/godel.repos + +RUN bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && apt update && rosdep install -y --ignore-packages-from-source --from-paths $CATKIN_WS/src" + +RUN bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && catkin build --no-status" \ No newline at end of file diff --git a/README.md b/README.md index 73e7b4ef..8ec57c79 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,17 @@ Godel: Austrian logician and mathematician http://en.wikipedia.org/wiki/Kurt_G%C ### Installation -- Install [wstool](http://wiki.ros.org/wstool) in order manage the repos inside the workspace +- Install [wstool](http://wiki.ros.org/wstool) and [catkin_tools](https://catkin-tools.readthedocs.io/en/latest/) in order manage the repos inside the workspace: ``` - sudo apt install python-wstool + pip install --user catkin_tools wstool ``` -- Cd into the 'src' directory of your catkin workspace and run the following: +- setup the workspace and dependencies ``` - wstool init . - wstool merge https://github.com/ros-industrial-consortium/godel/raw/kinetic-devel/godel.rosinstall - wstool update + mkdir -p catkin_ws/src + cd catkin_ws + git clone https://github.com/ros-industrial-consortium/godel src/godel + wstool init --shallow src src/godel/godel.repos rosdep install --from-paths . --ignore-src ``` diff --git a/godel.rosinstall b/godel.repos similarity index 88% rename from godel.rosinstall rename to godel.repos index fd9d7748..6dd813ac 100644 --- a/godel.rosinstall +++ b/godel.repos @@ -1,5 +1,4 @@ - git: {local-name: godel_openvoronoi, uri: 'https://github.com/ros-industrial-consortium/godel_openvoronoi.git', version: hydro-devel} -- git: {local-name: godel, uri: 'https://github.com/ros-industrial-consortium/godel.git', version: kinetic-devel} - git: {local-name: industrial_core, uri: 'https://github.com/ros-industrial/industrial_core.git', version: kinetic-devel} - git: {local-name: keyence_experimental, uri: 'https://github.com/ros-industrial/keyence_experimental.git', version: kinetic-devel} - git: {local-name: libsocket, uri: 'https://github.com/dermesser/libsocket.git', version: master}