Merge branch 'correctci' into 'master'

Correctci

See merge request esp8266/mqttfastledmenu!7
This commit is contained in:
Julien Cabillot 2017-11-08 09:49:12 +00:00
commit 0ab7805ae6
3 changed files with 22 additions and 20 deletions

View File

@ -5,23 +5,31 @@ inocode:
MEMORY: "custom_FlashSize=nodemcuv2_4M3M"
INSTBOARD: "esp8266:esp8266"
BOARD: "${INSTBOARD}:nodemcuv2"
ARDVER: "1.8.5"
GITREMDEB: "https://github.com/JoaoLopesF/ESP8266-RemoteDebug-Telnet.git"
before_script:
- apt update
- apt -y install xvfb
- Xvfb :1 -nolisten tcp -screen :1 1280x800x24 &
- export DISPLAY=":1"
- cd /
- wget --quiet "https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz" -O "arduino-nightly-linux64.tar.xz"
- tar axf "arduino-nightly-linux64.tar.xz"
- /arduino-nightly/arduino --pref "boardsmanager.additional.urls=${ESPURL}"
- /arduino-nightly/arduino --install-boards "${INSTBOARD}"
- wget --quiet "https://downloads.arduino.cc/arduino-${ARDVER}-linux64.tar.xz" -O "arduino-${ARDVER}-linux64.tar.xz"
- tar axf "arduino-${ARDVER}-linux64.tar.xz"
- /arduino-${ARDVER}/arduino --pref "boardsmanager.additional.urls=${ESPURL}" --save-prefs
- /arduino-${ARDVER}/arduino --install-boards "${INSTBOARD}"
- /arduino-${ARDVER}/arduino --pref "compiler.warning_level=all" --pref "${MEMORY}" --board "${BOARD}" --save-prefs
script:
- cd "/root/Arduino/libraries/"
- git clone "${GITREMDEB}"
- cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}"
- cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h"
- /arduino-nightly/arduino --install-library "FastLED"
- /arduino-nightly/arduino --install-library "PubSubClient"
- /arduino-nightly/arduino --pref "${MEMORY}" --board "${BOARD}" --verify "${CI_PROJECT_NAME}.ino"
- /arduino-${ARDVER}/arduino --install-library "FastLED"
- /arduino-${ARDVER}/arduino --install-library "PubSubClient"
- /arduino-${ARDVER}/arduino --verify "${CI_PROJECT_NAME}.ino"
yaml:
image: "python:alpine"
before_script:
- pip install "PyYAML"
- pip install "homeassistant"
script:
- cd "${CI_PROJECT_DIR}/home-assistant"
- python -c "from yaml import load, Loader; load(open('configuration.yaml'), Loader=Loader)"
- hass --config "${CI_PROJECT_DIR}/home-assistant" --script check_config

View File

@ -1,6 +0,0 @@
strip1_animation_speed:
name: "Strip1 Animation Speed"
initial: 120
min: 1
max: 150
step: 8

View File

@ -5,7 +5,7 @@ mqtt:
username: "XXX"
password: "XXX"
input_slider: !include_dir_merge_named "conf_input_slider.d/"
input_number: !include_dir_merge_named "conf_input_number.d/"
light: !include_dir_merge_list "conf_light.d/"
automation: !include_dir_merge_list "conf_automation.d/"
group: !include_dir_merge_named "conf_group.d/"