Merge pull request #3210 from thinkyhead/rc_cleanup_travis_ci

Improve Travis CI test
This commit is contained in:
Scott Lahteine 2016-03-23 00:32:45 -07:00
commit b705ae0cb0
10 changed files with 131 additions and 150 deletions

View file

@ -26,199 +26,144 @@ install:
- mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C - mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C
- git clone https://github.com/lincomatic/LiquidTWI2.git - git clone https://github.com/lincomatic/LiquidTWI2.git
- mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2 - mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
# Install astyle
- wget https://github.com/timonwong/astyle-mirror/archive/master.zip
- unzip master.zip
- cd astyle-mirror-master/build/gcc/
- make prefix=$HOME astyle install
before_script: before_script:
# arduino requires an X server even with command line # arduino requires an X server even with command line
# https://github.com/arduino/Arduino/issues/1981 # https://github.com/arduino/Arduino/issues/1981
- Xvfb :1 -screen 0 1024x768x16 &> xvfb.log & - Xvfb :1 -screen 0 1024x768x16 &> xvfb.log &
# change back to home directory for compiling # change back to home directory for compiling
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR
# Check style
# ~/bin/astyle --recursive --options=.astylerc "Marlin/*.h" "Marlin/*.cpp"
script: script:
# Abort on style errors
# if [ "0" != `find . -name "*.orig" | wc -l` ] ; then echo "Improperly styled source -- run astyle" ; exit -999; fi
# Relaxed Travis check
# if [ "0" != `find . -name "*.orig" | wc -l` ] ; then echo "Improperly styled source -- run astyle" ; fi
# build default config # build default config
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - build_marlin
# backup configuration.h # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h
- cp Marlin/Configuration.h Marlin/Configuration.h.backup - cp Marlin/Configuration.h Marlin/Configuration.h.backup
- cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
- cp Marlin/pins_RAMPS_14.h Marlin/pins_RAMPS_14.h.backup - cp Marlin/pins_RAMPS_14.h Marlin/pins_RAMPS_14.h.backup
# add sensor for bed # add sensor for bed
- sed -i 's/#define TEMP_SENSOR_BED 0/#define TEMP_SENSOR_BED 1/g' Marlin/Configuration.h - opt_set TEMP_SENSOR_BED 1
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# change extruder numbers from 1 to 2 # change extruder numbers from 1 to 2
- sed -i 's/#define MOTHERBOARD BOARD_RAMPS_14_EFB/#define MOTHERBOARD BOARD_RAMPS_14_EEB/g' Marlin/Configuration.h - opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
- sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/g' Marlin/Configuration.h - opt_set EXTRUDERS 2
- sed -i 's/#define TEMP_SENSOR_1 0/#define TEMP_SENSOR_1 1/g' Marlin/Configuration.h - opt_set TEMP_SENSOR_1 1
#- cat Marlin/Configuration.h #- cat Marlin/Configuration.h
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h # change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h
- sed -i 's/#define MOTHERBOARD BOARD_RAMPS_14_EEB/#define MOTHERBOARD BOARD_RUMBA/g' Marlin/Configuration.h - opt_set MOTHERBOARD BOARD_RUMBA
- sed -i 's/#define EXTRUDERS 2/#define EXTRUDERS 3/g' Marlin/Configuration.h - opt_set EXTRUDERS 3
- sed -i 's/#define TEMP_SENSOR_2 0/#define TEMP_SENSOR_2 1/g' Marlin/Configuration.h - opt_set TEMP_SENSOR_2 1
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable PIDTEMPBED # enable PIDTEMPBED
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define PIDTEMPBED/#define PIDTEMPBED/g' Marlin/Configuration.h - opt_enable PIDTEMPBED
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable AUTO_BED_LEVELING # enable AUTO_BED_LEVELING
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h - opt_enable ENABLE_AUTO_BED_LEVELING
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable AUTO_BED_LEVELING with servos # enable AUTO_BED_LEVELING with servos
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h - opt_enable ENABLE_AUTO_BED_LEVELING NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- sed -i 's/\/\/#define NUM_SERVOS/#define NUM_SERVOS/g' Marlin/Configuration.h - build_marlin
- sed -i 's/\/\/#define Z_ENDSTOP_SERVO_NR/#define Z_ENDSTOP_SERVO_NR/g' Marlin/Configuration.h
- sed -i 's/\/\/#define SERVO_ENDSTOP_ANGLES/#define SERVO_ENDSTOP_ANGLES/g' Marlin/Configuration.h
- sed -i 's/\/\/#define DEACTIVATE_SERVOS_AFTER_MOVE/#define DEACTIVATE_SERVOS_AFTER_MOVE/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable EEPROM_SETTINGS & EEPROM_CHITCHAT # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define EEPROM_SETTINGS/#define EEPROM_SETTINGS/g' Marlin/Configuration.h - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
- sed -i 's/\/\/#define EEPROM_CHITCHAT/#define EEPROM_CHITCHAT/g' Marlin/Configuration.h - build_marlin
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
### LCDS ### ### LCDS ###
# ULTIMAKERCONTROLLER # ULTIMAKERCONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h - opt_enable ULTIMAKERCONTROLLER
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# MAKRPANEL # MAKRPANEL
# Needs to use melzi and sanguino hardware # Needs to use melzi and sanguino hardware
#- cp Marlin/Configuration.h.backup Marlin/Configuration.h #- restore_configs
#- sed -i 's/\/\/#define MAKRPANEL/#define MAKRPANEL/g' Marlin/Configuration.h #- opt_enable MAKRPANEL
#- rm -rf .build/ #- build_marlin
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# REPRAP_DISCOUNT_SMART_CONTROLLER # REPRAP_DISCOUNT_SMART_CONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define SDSUPPORT/#define SDSUPPORT/g' Marlin/Configuration.h - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
- sed -i 's/\/\/#define REPRAP_DISCOUNT_SMART_CONTROLLER/#define REPRAP_DISCOUNT_SMART_CONTROLLER/g' Marlin/Configuration.h - build_marlin
- rm -rf .build/ # G3D_PANEL
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - restore_configs
# G3D_PANE - opt_enable G3D_PANEL SDSUPPORT
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - build_marlin
- sed -i 's/\/\/#define G3D_PANEL/#define G3D_PANEL/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/g' Marlin/Configuration.h - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# REPRAPWORLD_KEYPAD # REPRAPWORLD_KEYPAD
# Cant find configuration details to get it to compile # Cant find configuration details to get it to compile
#- cp Marlin/Configuration.h.backup Marlin/Configuration.h #- restore_configs
#- sed -i 's/\/\/#define ULTRA_LCD/#define ULTRA_LCD/g' Marlin/Configuration.h #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
#- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD/#define REPRAPWORLD_KEYPAD/g' Marlin/Configuration.h #- build_marlin
#- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/g' Marlin/Configuration.h
#- rm -rf .build/
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# RA_CONTROL_PANEL # RA_CONTROL_PANEL
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define RA_CONTROL_PANEL/#define RA_CONTROL_PANEL/g' Marlin/Configuration.h - opt_enable RA_CONTROL_PANEL
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
### I2C PANELS ### ### I2C PANELS ###
# LCD_I2C_SAINSMART_YWROBOT # LCD_I2C_SAINSMART_YWROBOT
# Failing at the moment needs different library # Failing at the moment needs different library
#- cp Marlin/Configuration.h.backup Marlin/Configuration.h #- restore_configs
#- sed -i 's/\/\/#define LCD_I2C_SAINSMART_YWROBOT/#define LCD_I2C_SAINSMART_YWROBOT/g' Marlin/Configuration.h #- opt_enable LCD_I2C_SAINSMART_YWROBOT
#- rm -rf .build/ #- build_marlin
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# LCD_I2C_PANELOLU2 # LCD_I2C_PANELOLU2
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define LCD_I2C_PANELOLU2/#define LCD_I2C_PANELOLU2/g' Marlin/Configuration.h - opt_enable LCD_I2C_PANELOLU2
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# LCD_I2C_VIKI # LCD_I2C_VIKI
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define LCD_I2C_VIKI/#define LCD_I2C_VIKI/g' Marlin/Configuration.h - opt_enable LCD_I2C_VIKI
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# LCM1602 # LCM1602
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define LCM1602/#define LCM1602/g' Marlin/Configuration.h - opt_enable LCM1602
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable FILAMENTCHANGEENABLE # Enable FILAMENTCHANGEENABLE
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define FILAMENTCHANGEENABLE/#define FILAMENTCHANGEENABLE/g' Marlin/Configuration.h - opt_enable FILAMENTCHANGEENABLE
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable filament sensor # Enable filament sensor
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h - opt_enable FILAMENT_SENSOR
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable filament sensor with LCD display # Enable filament sensor with LCD display
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h - opt_enable ULTIMAKERCONTROLLER FILAMENT_SENSOR FILAMENT_LCD_DISPLAY
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h - build_marlin
- sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable COREXY # Enable COREXY
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define COREXY/#define COREXY/g' Marlin/Configuration.h - opt_enable COREXY
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable COREXZ # Enable COREXZ
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define COREXZ/#define COREXZ/g' Marlin/Configuration.h - opt_enable COREXZ
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
- cp Marlin/Configuration.h.backup Marlin/Configuration.h - restore_configs
- sed -i 's/\/\/#define Z_DUAL_STEPPER_DRIVERS/#define Z_DUAL_STEPPER_DRIVERS/g' Marlin/Configuration_adv.h - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
- sed -i 's/\ \ \/\/\ \#define Z_DUAL_ENDSTOPS/#define Z_DUAL_ENDSTOPS/g' Marlin/Configuration_adv.h - pins_set RAMPS_14 X_MAX_PIN -1
- sed -i 's/#define X_MAX_PIN 2/#define X_MAX_PIN -1/g' Marlin/pins_RAMPS_14.h - opt_set_adv Z2_MAX_PIN 2
- sed -i 's/\ \ \ \ \#define Z2_MAX_PIN 36/#define Z2_MAX_PIN 2/g' Marlin/Configuration_adv.h - build_marlin
- rm -rf .build/ - restore_configs
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h
- cp Marlin/pins_RAMPS_14.h.backup Marlin/pins_RAMPS_14.h
######## Example Configurations ############## ######## Example Configurations ##############
# Delta Config (generic) # Delta Config (generic)
- cp Marlin/example_configurations/delta/generic/Configuration* Marlin/ - use_example_configs delta/generic
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Delta Config (generic) + ABL + ALLEN_KEY # Delta Config (generic) + ABL + ALLEN_KEY
- cp Marlin/example_configurations/delta/generic/Configuration* Marlin/ - use_example_configs delta/generic
- sed -i 's/#define DISABLE_MIN_ENDSTOPS/\/\/#define DISABLE_MIN_ENDSTOPS/g' Marlin/Configuration.h - opt_disable DISABLE_MIN_ENDSTOPS
- sed -i 's/\/\/#define AUTO_BED_LEVELING_FEATURE/#define AUTO_BED_LEVELING_FEATURE/g' Marlin/Configuration.h - opt_enable AUTO_BED_LEVELING_FEATURE Z_PROBE_ALLEN_KEY
- sed -i 's/\/\/#define Z_PROBE_ALLEN_KEY/#define Z_PROBE_ALLEN_KEY/g' Marlin/Configuration.h - build_marlin
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Delta Config (Mini Kossel) # Delta Config (Mini Kossel)
- cp Marlin/example_configurations/delta/kossel_mini/Configuration* Marlin/ - use_example_configs delta/kossel_mini
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Makibox Config need to check board type for Teensy++ 2.0 # Makibox Config need to check board type for Teensy++ 2.0
#- cp Marlin/example_configurations/makibox/Configuration* Marlin/ #- use_example_configs makibox
#- rm -rf .build/ #- build_marlin
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# SCARA Config # SCARA Config
- cp Marlin/example_configurations/SCARA/Configuration* Marlin/ - use_example_configs SCARA
- rm -rf .build/ - build_marlin
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# tvrrug Config need to check board type for sanguino atmega644p # tvrrug Config need to check board type for sanguino atmega644p
#- cp Marlin/example_configurations/tvrrug/Round2/Configuration* Marlin/ #- use_example_configs tvrrug/Round2
#- rm -rf .build/ #- build_marlin
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
######## Board Types ############# ######## Board Types #############

4
LinuxAddons/bin/build_marlin Executable file
View file

@ -0,0 +1,4 @@
#!/usr/bin/env bash
rm -rf .build/
DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino

5
LinuxAddons/bin/opt_disable Executable file
View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
for opt in "$@" ; do
eval "sed -i 's/\(\/\/ *\)*\(\#define *$opt\)/\/\/\2/g' Marlin/Configuration.h"
done

5
LinuxAddons/bin/opt_enable Executable file
View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
for opt in "$@" ; do
eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration.h"
done

5
LinuxAddons/bin/opt_enable_adv Executable file
View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
for opt in "$@" ; do
eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration_adv.h"
done

3
LinuxAddons/bin/opt_set Executable file
View file

@ -0,0 +1,3 @@
#!/usr/bin/env bash
eval "sed -i 's/\(#define *$1\) *.*$/\1 $2/g' Marlin/Configuration.h"

3
LinuxAddons/bin/opt_set_adv Executable file
View file

@ -0,0 +1,3 @@
#!/usr/bin/env bash
eval "sed -i 's/\(#define *$1\) *.*$/\1 $2/g' Marlin/Configuration_adv.h"

3
LinuxAddons/bin/pins_set Executable file
View file

@ -0,0 +1,3 @@
#!/usr/bin/env bash
eval "sed -i 's/\(#define *$2\) *.*$/\1 $3/g' Marlin/pins_$1.h"

View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
cp Marlin/Configuration.h.backup Marlin/Configuration.h
cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h
cp Marlin/pins_RAMPS_14.h.backup Marlin/pins_RAMPS_14.h

View file

@ -0,0 +1,3 @@
#!/usr/bin/env bash
eval "cp Marlin/example_configurations/$1/Configuration* Marlin/"