travis docker environment compatibility
This commit is contained in:
parent
52fe86e66d
commit
f27be21076
|
@ -29,15 +29,13 @@ if [ $RUNTESTS ] ; then
|
||||||
elif [ $PUBLISHDOCS ] ; then
|
elif [ $PUBLISHDOCS ] ; then
|
||||||
if [ $PUBLISH_URL ] ; then
|
if [ $PUBLISH_URL ] ; then
|
||||||
|
|
||||||
sudo apt-get install zlib1g-dev libssl-dev wkhtmltopdf libxml2-dev libxslt-dev #ruby-rvm
|
|
||||||
|
|
||||||
# Patch Gimli to fix underscores_inside_words
|
# Patch Gimli to fix underscores_inside_words
|
||||||
curl -L "${CURL_BASEOPTS[@]}" https://github.com/walle/gimli/archive/v0.5.9.tar.gz | tar zxf -
|
curl -L "${CURL_BASEOPTS[@]}" https://github.com/walle/gimli/archive/v0.5.9.tar.gz | tar zxf -
|
||||||
|
|
||||||
sed -i 's/).render(/, :no_intra_emphasis => true).render(/' gimli-0.5.9/ext/github_markup.rb
|
sed -i 's/).render(/, :no_intra_emphasis => true).render(/' gimli-0.5.9/ext/github_markup.rb
|
||||||
|
|
||||||
cd gimli-0.5.9/
|
cd gimli-0.5.9/
|
||||||
gem build gimli.gemspec && rvmsudo gem install gimli
|
gem build gimli.gemspec && gem install gimli
|
||||||
cd ../
|
cd ../
|
||||||
|
|
||||||
./build_docs.sh
|
./build_docs.sh
|
||||||
|
|
17
.travis.yml
17
.travis.yml
|
@ -17,16 +17,29 @@ env:
|
||||||
- TARGET=ALIENWIIF1
|
- TARGET=ALIENWIIF1
|
||||||
- TARGET=ALIENWIIF3
|
- TARGET=ALIENWIIF3
|
||||||
|
|
||||||
|
# use new docker environment
|
||||||
|
sudo: false
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- build-essential
|
||||||
|
- git
|
||||||
|
- libc6-i386
|
||||||
|
- zlib1g-dev
|
||||||
|
- libssl-dev
|
||||||
|
- wkhtmltopdf
|
||||||
|
- libxml2-dev
|
||||||
|
- libxslt-dev
|
||||||
|
|
||||||
# We use cpp for unit tests, and c for the main project.
|
# We use cpp for unit tests, and c for the main project.
|
||||||
language: cpp
|
language: cpp
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get update
|
|
||||||
- curl --retry 10 --retry-max-time 120 -L "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2" | tar xfj -
|
- curl --retry 10 --retry-max-time 120 -L "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2" | tar xfj -
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo apt-get install build-essential git libc6-i386
|
|
||||||
- export PATH=$PATH:$PWD/gcc-arm-none-eabi-4_9-2015q2/bin
|
- export PATH=$PATH:$PWD/gcc-arm-none-eabi-4_9-2015q2/bin
|
||||||
|
|
||||||
before_script: arm-none-eabi-gcc --version
|
before_script: arm-none-eabi-gcc --version
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
filename=Manual
|
filename=Manual
|
||||||
doc_files=(
|
doc_files=(
|
||||||
'Introduction.md'
|
'Introduction.md'
|
||||||
'Getting Started.md'
|
'Getting Started.md'
|
||||||
'Safety.md'
|
'Safety.md'
|
||||||
'Installation.md'
|
'Installation.md'
|
||||||
'Configuration.md'
|
'Configuration.md'
|
||||||
|
@ -57,7 +57,3 @@ else
|
||||||
echo -e "https://github.com/walle/gimli\n"
|
echo -e "https://github.com/walle/gimli\n"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue