Skip to content

Commit d30437f

Browse files
authored
Merge branch 'master' into enhancement/brianhou/saver-enumflags
2 parents cc89d48 + 5d653e8 commit d30437f

File tree

115 files changed

+2762
-3381
lines changed

Some content is hidden

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

115 files changed

+2762
-3381
lines changed

.appveyor.yml

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

.ci/after_failure.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
cd "${HOME}/workspace"
6+
7+
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
8+
cat ./build/aikido/Testing/Temporary/LastTest.log
9+
cat ./build/aikido/Testing/Temporary/LastTestsFailed.log
10+
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
11+
cat Testing/Temporary/LastTest.log
12+
cat Testing/Temporary/LastTestsFailed.log
13+
fi

.ci/after_script.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
cd "${HOME}/workspace"
6+
7+
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
8+
./scripts/view-all-results.sh test_results
9+
fi

.ci/before_install.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
6+
. "${TRAVIS_BUILD_DIR}/.ci/before_install_linux.sh";
7+
fi

.ci/before_install_linux.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#!/usr/bin/env bash
22

3-
set -e
3+
set -ex
44

55
# Install test fixture dependencies.
66
mkdir -p "${HOME}/workspace/src"
77
cd "${HOME}/workspace"
88
git clone https://github.com/personalrobotics/pr-cleanroom.git scripts
99
curl -sS "${DISTRIBUTION}" > distribution.yml
1010
./scripts/internal-setup.sh
11-
export PACKAGE_NAMES="$(./scripts/internal-get-packages.py distribution.yml ${REPOSITORY})"

.ci/build_docs.sh

100644100755
Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,38 @@
11
#!/usr/bin/env bash
22

3-
set -e
3+
set -ex
44

5-
# Build documentation
6-
./scripts/internal-run.sh catkin build --no-status --no-deps -p 1 -i --cmake-args -DDOWNLOAD_TAGFILES=$DOWNLOAD_TAGFILES --make-args docs -- aikido > /dev/null
5+
cd "${HOME}/workspace"
6+
. devel/setup.bash
77

8-
# Organize into "master" subdirectory
9-
mkdir -p "${TRAVIS_BUILD_DIR}/gh-pages"
10-
mv "${HOME}/workspace/build/aikido/doxygen" "${TRAVIS_BUILD_DIR}/gh-pages/master"
8+
AIKIDO_DIR="${HOME}/workspace/src/aikido"
119

12-
# Generate hard-coded list of API versions
13-
cat <<EOF > "${TRAVIS_BUILD_DIR}/gh-pages/README.md"
10+
# For branch builds, Travis only clones that branch with a fixed depth of 50
11+
# commits. This means that the clone knows nothing about other Git branches or
12+
# tags. We fix this by deleting and re-cloning the full repository.
13+
rm -rf ${AIKIDO_DIR}
14+
git clone "https://github.com/${TRAVIS_REPO_SLUG}.git" ${AIKIDO_DIR}
15+
16+
# Organize into "gh-pages" directory
17+
mkdir -p ${TRAVIS_BUILD_DIR}/gh-pages
18+
19+
# Initialize list of API versions
20+
cat <<EOF > ${TRAVIS_BUILD_DIR}/gh-pages/README.md
1421
## API Documentation
1522
16-
* [master](https://personalrobotics.github.io/aikido/master/)
1723
EOF
24+
25+
mkdir build_docs
26+
cd build_docs
27+
28+
while read version; do
29+
# Add entry to list of API versions
30+
echo "* [${version}](https://personalrobotics.github.io/aikido/${version}/)" >> ${TRAVIS_BUILD_DIR}/gh-pages/README.md
31+
32+
# Build documentation
33+
git -C ${AIKIDO_DIR} checkout ${version}
34+
rm -rf *
35+
cmake -DDOWNLOAD_TAGFILES=ON ${AIKIDO_DIR}
36+
make docs
37+
mv doxygen ${TRAVIS_BUILD_DIR}/gh-pages/${version}
38+
done < ${TRAVIS_BUILD_DIR}/.ci/docs_versions.txt

.ci/docker/env.list

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
TRAVIS
2+
TRAVIS_PULL_REQUEST
3+
TRAVIS_OS_NAME
4+
TRAVIS_BUILD_DIR
5+
6+
BUILD_NAME
7+
BUILD_TYPE
8+
CATKIN_CONFIG_OPTIONS
9+
DISTRIBUTION
10+
REPOSITORY
11+
SUDO

.ci/docker/ubuntu-bionic

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM ubuntu:bionic
2+
3+
# Workaround to suppress "Warning: apt-key output should not be parsed (stdout is not a terminal)"
4+
ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
5+
6+
RUN apt-get update -qq
7+
RUN apt-get install -y \
8+
build-essential \
9+
cmake \
10+
curl \
11+
git \
12+
lsb-release \
13+
pkg-config \
14+
python \
15+
software-properties-common \
16+
sudo

.ci/docker/ubuntu-xenial

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM ubuntu:xenial
2+
3+
RUN apt-get update -qq
4+
RUN apt-get install -y \
5+
build-essential \
6+
cmake \
7+
curl \
8+
git \
9+
lsb-release \
10+
pkg-config \
11+
python \
12+
software-properties-common \
13+
sudo

.ci/docs_versions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
master

0 commit comments

Comments
 (0)