From 86cc22d63978cc72518dcc1541cfb280e46e21fc Mon Sep 17 00:00:00 2001 From: monkeydave Date: Sat, 3 Jan 2015 11:43:40 +0000 Subject: [PATCH 1/2] Readd .travis.yml, change build enviroment to use ino instead of gcc --- .travis.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..5d953fe1d1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,38 @@ +--- +language: c + +before_install: + - pwd + - wget https://bootstrap.pypa.io/get-pip.py + - wget https://bintray.com/artifact/download/olikraus/u8glib/u8glib_arduino_v1.17.zip +install: + - sudo python get-pip.py + - sudo pip install ino + # add ppa for newer version of Arduino than available in ubuntu 12.04 + - sudo add-apt-repository ppa:michael-gruz/elektronik -y + - sudo apt-get update -q + - sudo apt-get install arduino +before_script: + # add U8glib, LiquidCrystal_I2C & LiquidTWI2 libraries + - sudo unzip u8glib_arduino_v1.17.zip -d /usr/share/arduino/libraries/ + - cd /usr/share/arduino/libraries/ + - sudo git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git + - ls -la + - ls -la LiquidCrystal_I2C/ + - sudo git clone https://github.com/lincomatic/LiquidTWI2.git + # remove Robot_Control library to stop compile error! + - sudo rm -rf /usr/share/arduino/libraries/Robot_Control + # change back to home directory for compiling + - cd /home/travis/build/monkeydave/Marlin + # ino needs files in src directory + - ln -s Marlin src + # remove Marlin.pde as it confuses ino + - rm Marlin/Marlin.pde +script: + - ino build -m mega2560 + - cp Marlin/example_configurations/delta/Configuration* Marlin/ + - rm -rf .build/ + - ino build -m mega2560 + - sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EFB/#define MOTHERBOARD BOARD_DUEMILANOVE_328P/g' Marlin/Configuration.h + - rm -rf .build/ + - ino build -m atmega328 \ No newline at end of file From 21cc188272a68b89b30d969038acc2c3644bb677 Mon Sep 17 00:00:00 2001 From: monkeydave Date: Sat, 3 Jan 2015 12:09:12 +0000 Subject: [PATCH 2/2] Updated .travis.yml for ErikZalm branch pull request --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d953fe1d1..2b34d7ee12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ before_script: # remove Robot_Control library to stop compile error! - sudo rm -rf /usr/share/arduino/libraries/Robot_Control # change back to home directory for compiling - - cd /home/travis/build/monkeydave/Marlin + - cd /home/travis/build/ErikZalm/Marlin # ino needs files in src directory - ln -s Marlin src - # remove Marlin.pde as it confuses ino + # remove Marlin.pde as it confuses ino after it finds Marlin.ino - rm Marlin/Marlin.pde script: - ino build -m mega2560