From 394bd21efe925db3a052ad72e085a1045e933655 Mon Sep 17 00:00:00 2001 From: Luc Date: Thu, 9 May 2019 22:20:19 +0800 Subject: [PATCH] Clean travis script --- .gitlab-ci.yml | 66 -------------------------------------------------- .travis.yml | 34 +++++++++----------------- 2 files changed, 12 insertions(+), 88 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index d373ebd7..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,66 +0,0 @@ -before_script: - - cd $HOME - - wget https://pypi.python.org/packages/df/c9/d9da7fafaf2a2b323d20eee050503ab08237c16b0119c7bbf1597d53f793/pyserial-2.7.tar.gz#md5=794506184df83ef2290de0d18803dd11 - - tar -xvf pyserial-2.7.tar.gz - - cd pyserial-2.7 - - python ./setup.py install - - wget http://downloads.arduino.cc/arduino-1.8.0-linux64.tar.xz - - tar xf ./arduino-1.8.0-linux64.tar.xz - - mv arduino-1.8.0 $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 .. - - touch pt.txt - - echo 'build.flash_ld=eagle.flash.4m.ld' >> pt.txt - - echo 'build.flash_freq=40' >> pt.txt - - echo 'build.flash_size=4M' >> pt.txt - - echo 'build.f_cpu=160000000L' >> pt.txt - - echo 'build.flash_mode=dio' >> pt.txt - - cat ./platform.txt >> pt.txt - - rm -fr platform.txt - - mv pt.txt platform.txt - - mv $CI_PROJECT_DIR/libraries/SdFat/SdFat $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/IniFile $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/ESPAsyncWebServer $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/ESPAsyncTCP $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/AsyncTCP $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/oled-ssd1306 $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/ESP32SSDP $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/arduinoWebSockets $HOME/arduino_ide/libraries/ - - mv $CI_PROJECT_DIR/libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/libraries/ - - mkdir $HOME/arduino_ide/libraries/ESP3D - - mv $CI_PROJECT_DIR/src $HOME/arduino_ide/libraries/ESP3D - - mv $CI_PROJECT_DIR/library.properties $HOME/arduino_ide/libraries/ESP3D - - cd $HOME/arduino_ide/hardware - - mkdir esp32 - - cd esp32 - - git clone https://github.com/espressif/arduino-esp32.git esp32 - - cd esp32 - - cd tools - - python get.py - - cd .. - - touch pt.txt - - echo 'build.flash_freq=80m' >> pt.txt - - cat ./platform.txt >> pt.txt - - rm -fr platform.txt - - mv pt.txt platform.txt - -job1: - script: - - cd $CI_PROJECT_DIR - - source command.sh - - export PATH="$HOME/arduino_ide:$PATH" - - arduino --get-pref - - arduino --board esp8266com:esp8266:generic --save-prefs - - sed -i "s/\/\/#define SDCARD_FEATURE /#define SDCARD_FEATURE/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h - - echo "build ESP8266" - - build_sketch $CI_PROJECT_DIR/examples/basicesp3d/basicesp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs - - echo "build ESP32" - - build_sketch $CI_PROJECT_DIR/examples/basicesp3d/basicesp3d.ino - - diff --git a/.travis.yml b/.travis.yml index 4ee3cab3..194578e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,25 +15,12 @@ before_script: - 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 - - echo 'build.flash_flags=-DFLASHMODE_DIO' >> platform.txt - - sed -i "s/build.lwip_lib=-llwip_gcc/build.lwip_lib=-llwip2-536-feat/g" ./platform.txt - - 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 - 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/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/ESPAsyncTCP $HOME/arduino_ide/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/AsyncTCP $HOME/arduino_ide/libraries/ @@ -47,22 +34,25 @@ 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 + - rm -f $HOME/.arduino15/preferences.txt + - arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic --save-prefs - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs + - rm -f $HOME/.arduino15/preferences.txt + - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=80,PSRAM=disabled,CPUFreq=240,FlashMode=qio,FlashSize=4M,DebugLevel=none --pref compiler.warning_level=all --save-prefs - 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 + - rm -f $HOME/.arduino15/preferences.txt + - arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic --save-prefs - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs + - rm -f $HOME/.arduino15/preferences.txt + - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=80,PSRAM=disabled,CPUFreq=240,FlashMode=qio,FlashSize=4M,DebugLevel=none --pref compiler.warning_level=all --save-prefs - 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 + - rm -f $HOME/.arduino15/preferences.txt + - arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic --save-prefs - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - - arduino --board esp32:esp32:esp32 --save-prefs + - rm -f $HOME/.arduino15/preferences.txt + - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=80,PSRAM=disabled,CPUFreq=240,FlashMode=qio,FlashSize=4M,DebugLevel=none --pref compiler.warning_level=all --save-prefs - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino notifications: