Skip to content

Commit 5ed6955

Browse files
portaloffreedomportaloffreedom
authored
Merge pull request #49 from ci-group/development
Update to release 2.0
2 parents ff12ac6 + 6d418db commit 5ed6955

File tree

248 files changed

+106474
-2523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+106474
-2523
lines changed

‎.circleci/config.yml‎

Lines changed: 84 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,106 @@ jobs:
55
- image: circleci/python:3-stretch-node
66
steps:
77
- checkout
8+
- run: git submodule sync
9+
- run: git submodule update --init
810

911
- setup_remote_docker:
1012
docker_layer_caching: true
1113

14+
- restore_cache:
15+
keys:
16+
- v1-{{ .Branch }}
17+
- v1-
18+
paths:
19+
- ~/caches/revolve.tar
20+
- run:
21+
name: Load Docker image layer cache
22+
command: |
23+
set +o pipefail
24+
docker load -i ~/caches/revolve.tar | true
1225
- run:
1326
name: "Build Docker image"
14-
command: docker build -t cigroup/revolve:$CIRCLE_BRANCH .
27+
command: docker build --cache-from=app -t cigroup/revolve:${CIRCLE_BRANCH//\//_} .
28+
# - run:
29+
# name: "Build documentation"
30+
# command: |
31+
# DOXY_BUILD=/revolve/docker/make_dosc.sh
32+
# docker run -it cigroup/revolve:${CIRCLE_BRANCH//\//_} ${DOXY_BUILD}
33+
- run:
34+
name: Save Docker image layer cache
35+
command: |
36+
mkdir -p ~/caches
37+
docker save -o ~/caches/revolve.tar cigroup/revolve:${CIRCLE_BRANCH//\//_}
38+
- save_cache:
39+
key: v1-{{ .Branch }}-{{ epoch }}
40+
paths:
41+
- ~/caches/revolve.tar
42+
test:
43+
docker:
44+
- image: circleci/python:3-stretch-node
45+
46+
steps:
47+
- setup_remote_docker:
48+
docker_layer_caching: true
1549

50+
- restore_cache:
51+
keys:
52+
- v1-{{ .Branch }}
53+
paths:
54+
- ~/caches/revolve.tar
55+
- run:
56+
name: Load Docker image layer cache
57+
command: |
58+
set +o pipefail
59+
docker load -i ~/caches/revolve.tar | true
1660
- run:
1761
name: "Run Python tests"
1862
command: |
1963
PY_TESTS=/revolve/docker/test_python.sh
20-
docker run -it cigroup/revolve:$CIRCLE_BRANCH ${PY_TESTS}
64+
docker run -it cigroup/revolve:${CIRCLE_BRANCH//\//_} ${PY_TESTS}
65+
66+
deploy:
67+
docker:
68+
- image: circleci/python:3-stretch-node
69+
70+
steps:
71+
- setup_remote_docker:
72+
docker_layer_caching: true
73+
74+
- restore_cache:
75+
keys:
76+
- v1-{{ .Branch }}
77+
paths:
78+
- ~/caches/revolve.tar
79+
80+
- run:
81+
name: Load Docker image layer cache
82+
command: |
83+
set +o pipefail
84+
docker load -i ~/caches/revolve.tar | true
2185
2286
- run:
2387
name: "Save Docker image"
2488
command: |
2589
set -e
2690
TAG=0.1.$CIRCLE_BUILD_NUM
2791
docker login -u $DOCKER_USER -p $DOCKER_PASS
28-
docker push cigroup/revolve:$CIRCLE_BRANCH
92+
docker push cigroup/revolve:${CIRCLE_BRANCH//\//_}
2993
30-
# - run:
31-
# name: "Build documentation"
32-
# command: |
33-
# DOXY_BUILD=/revolve/docker/make_dosc.sh
34-
# docker run -it cigroup/revolve:$CIRCLE_BRANCH ${DOXY_BUILD}
94+
workflows:
95+
version: 2
96+
build_test_deploy:
97+
jobs:
98+
- build
99+
- test:
100+
requires:
101+
- build
102+
- deploy:
103+
requires:
104+
- build
105+
- test
106+
filters:
107+
branches:
108+
only:
109+
- master
110+
- development

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ htmlcov/
4545
nosetests.xml
4646
coverage.xml
4747
*,cover
48+
experiments/examples/output/
49+
test.py
4850

4951
# Translations
5052
*.mo
@@ -67,8 +69,10 @@ target/
6769

6870
# Virtual env
6971
.venv*/
72+
.python-version
73+
Pipfile
74+
Pipfile.lock
7075

7176
# Revolve related
7277
*.sdf
73-
*.urdf
74-
*.yaml
78+
*.urdf

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "thirdparty/limbo"]
2+
path = thirdparty/limbo
3+
url = https://github.com/resibots/limbo.git

‎ACKNOWLEDGMENTS‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎AUTHORS‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ cmake_minimum_required(VERSION 2.8.12)
22

33
project(revolve)
44

5+
if (BUILD_RASPBERRY)
6+
add_subdirectory(thirdparty/PIGPIO)
7+
endif()
8+
59
add_subdirectory(cpprevolve)

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎Dockerfile‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
FROM ubuntu:bionic
1+
FROM cigroup/gazebo:gazebo10-revolve
22

33
# Dependencies
4-
RUN apt-get update
5-
RUN apt-get install -y build-essential \
6-
libboost-all-dev \
4+
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
5+
build-essential \
76
cmake \
8-
curl \
9-
cppcheck \
10-
doxygen \
117
git \
12-
gsl-bin libgsl0-dev \
13-
mercurial \
14-
pkg-config \
15-
python \
8+
libgsl0-dev \
169
python3-pip \
1710
libyaml-cpp-dev \
18-
xsltproc \
19-
libcairo2-dev
20-
RUN apt-get install -y libgazebo9-dev gazebo9
21-
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
11+
libcairo2-dev \
12+
graphviz \
13+
libeigen3-dev \
14+
libnlopt-dev && \
15+
apt-get clean && \
16+
rm -rf /var/lib/apt/lists/*
2217

2318
ADD . /revolve
2419
RUN /revolve/docker/build_revolve.sh

0 commit comments

Comments
 (0)