diff --git a/.travis.yml b/.travis.yml index 4d63d102..5662b100 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,6 @@ before_script: - sed -i "s/build.lwip_include=lwip/build.lwip_include=lwip2/g" ./platform.txt - sed -i "s/build.lwip_flags=-DLWIP_OPEN_SRC/build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0/g" ./platform.txt - sed -i "s/generic.build.f_cpu=80000000L/generic.build.f_cpu=160000000L/g" ./boards.txt - #- rm -fr ./libraries/ESP8266mDNS/src/LEAmDNS.cpp - cd $HOME/arduino_ide/hardware - mkdir esp32 - cd esp32 @@ -42,31 +41,28 @@ before_script: - mv $TRAVIS_BUILD_DIR/libraries/ESP32SSDP $HOME/arduino_ide/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/arduinoWebSockets $HOME/arduino_ide/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/libraries/ - - mkdir $HOME/arduino_ide/libraries/ESP3D - - mv $TRAVIS_BUILD_DIR/src $HOME/arduino_ide/libraries/ESP3D - - mv $TRAVIS_BUILD_DIR/library.properties $HOME/arduino_ide/libraries/ESP3D - + script: - cd $TRAVIS_BUILD_DIR - source command.sh - export PATH="$HOME/arduino_ide:$PATH" - arduino --board esp8266com:esp8266:generic --save-prefs - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino - - sed -i "s/\/\/#define AUTHENTICATION_FEATURE /#define AUTHENTICATION_FEATURE/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino + - sed -i "s/\/\/#define AUTHENTICATION_FEATURE /#define AUTHENTICATION_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/config.h - arduino --board esp8266com:esp8266:generic --save-prefs - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino -# - sed -i "s/\/\/#define ASYNCWEBSERVER /#define ASYNCWEBSERVER/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h -# - arduino --board esp8266com:esp8266:generic --save-prefs -# - arduino --get-pref sketchbook.path -# - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino -# - arduino --board esp32:esp32:esp32 --save-prefs -# - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino + - sed -i "s/\/\/#define ASYNCWEBSERVER /#define ASYNCWEBSERVER/g" $TRAVIS_BUILD_DIR/esp3d/config.h + - arduino --board esp8266com:esp8266:generic --save-prefs + - arduino --get-pref sketchbook.path + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino + - arduino --board esp32:esp32:esp32 --save-prefs + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino notifications: email: diff --git a/tarvis.yml b/tarvis.yml deleted file mode 100644 index 142803dd..00000000 --- a/tarvis.yml +++ /dev/null @@ -1,67 +0,0 @@ -sudo: false - -language: bash - -os: - - linux - -before_script: - - sleep 3 # give xvfb some time to start - - wget http://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz - - tar xf arduino-1.8.5-linux64.tar.xz - - mv arduino-1.8.5 $HOME/arduino_ide - - cd $HOME/arduino_ide/hardware - - mkdir esp8266com - - cd esp8266com - - git clone https://github.com/esp8266/Arduino.git esp8266 - - cd esp8266/tools - - python get.py - - cd .. - - echo 'build.flash_ld=eagle.flash.4m.ld' >> platform.txt - - echo 'build.flash_freq=40' >> platform.txt - - echo 'build.flash_size=4M' >> platform.txt - - echo 'build.flash_mode=dio' >> platform.txt - - echo 'build.f_cpu=160000000L' >> platform.txt - - sed -i "s/generic.build.f_cpu=80000000L/generic.build.f_cpu=160000000L/g" ./boards.txt - - cd $HOME/arduino_ide/hardware - - mkdir esp32 - - cd esp32 - - git clone https://github.com/espressif/arduino-esp32.git esp32 - - cd esp32/tools - - python get.py - - cd .. - - echo 'build.flash_freq=40m' >> platform.txt - - mv $TRAVIS_BUILD_DIR/libraries/ESPAsyncWebServer $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/ESPAsyncTCP $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/AsyncTCP $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/oled-ssd1306 $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/ESP32SSDP $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/arduinoWebSockets $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - -script: - - cd $TRAVIS_BUILD_DIR - - source command.sh - - export PATH="$HOME/arduino_ide:$PATH" - - arduino --board esp8266com:esp8266:generic --save-prefs - - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - sed -i "s/\/\/#define AUTHENTICATION_FEATURE /#define AUTHENTICATION_FEATURE/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h - - arduino --board esp8266com:esp8266:generic --save-prefs - - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - sed -i "s/\/\/#define ASYNCWEBSERVER /#define ASYNCWEBSERVER/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h - - arduino --board esp8266com:esp8266:generic --save-prefs - - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - -notifications: - email: - on_success: change - on_failure: change