From bb62d0f75f7952a302624386c179315b9c59436b Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 6 Mar 2017 15:57:11 +0100 Subject: [PATCH] arduino a besoin d'un sous repertoire du meme nom --- .gitignore | 2 +- .gitlab-ci.yml | 7 +++---- arduino/{ => mqttfastledmenu}/mqttfastledmenu.example.h | 0 arduino/{ => mqttfastledmenu}/mqttfastledmenu.ino | 0 4 files changed, 4 insertions(+), 5 deletions(-) rename arduino/{ => mqttfastledmenu}/mqttfastledmenu.example.h (100%) rename arduino/{ => mqttfastledmenu}/mqttfastledmenu.ino (100%) diff --git a/.gitignore b/.gitignore index 7166903..3647168 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .vscode/* -arduino/mqttfastledmenu.h +arduino/mqttfastledmenu/mqttfastledmenu.h diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc03c5a..55abb96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,18 +6,17 @@ inocode: INSTBOARD: "esp8266:esp8266" BOARD: "${INSTBOARD}:nodemcuv2" before_script: - - apt update >/dev/null - 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}" script: - - cd "${CI_PROJECT_DIR}/arduino" - - cp "mqttfastledmenu.example.h" "mqttfastledmenu.h" + - 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 "mqttfastledmenu.ino" + - /arduino-nightly/arduino --pref "${MEMORY}" --board "${BOARD}" --verify "${CI_PROJECT_NAME}.ino" yaml: image: "python:alpine" diff --git a/arduino/mqttfastledmenu.example.h b/arduino/mqttfastledmenu/mqttfastledmenu.example.h similarity index 100% rename from arduino/mqttfastledmenu.example.h rename to arduino/mqttfastledmenu/mqttfastledmenu.example.h diff --git a/arduino/mqttfastledmenu.ino b/arduino/mqttfastledmenu/mqttfastledmenu.ino similarity index 100% rename from arduino/mqttfastledmenu.ino rename to arduino/mqttfastledmenu/mqttfastledmenu.ino