From 1c345b8480237895d3b26ae1775b05600f194c4d Mon Sep 17 00:00:00 2001
From: neri <neri@ctdo.de>
Date: Thu, 30 Jun 2022 14:29:02 +0200
Subject: [PATCH] Try to speed up drone deployment

---
 .drone.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7410d4e..5113014 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,15 +3,15 @@ kind: pipeline
 type: docker
 name: default
 steps:
-- name: prereq
+- name: fetch ip
   image: cburki/mosquitto-clients
   commands:
     - mosquitto_sub -h mqtt.ctdo.de -t "homie/$hostname/\$localip" -C 1 | tr -d '\n' >lastknownip
   environment:
     hostname:
       from_secret: hostname
-- name: build
-  image: python:3.10
+- name: configure
+  image: alpine
   commands:
     - sed -i "s/WIFISSID/$IOTSSID/" data/homie/config.json 
     - sed -i "s/WIFIPASS/$iotpwd/" data/homie/config.json 
@@ -19,13 +19,6 @@ steps:
     - sed -i "s/HOSTNAME/$hostname/g" data/homie/config.json 
     - lastknownip=$(cat lastknownip)
     - sed -i "s/HOSTNAME/$lastknownip/g" platformio.ini
-    - cat data/homie/config.json
-    - cat platformio.ini
-    - pip install -U platformio
-    # Build image
-    - platformio run --environment d1_mini
-    # Build file system image
-    - platformio run --target buildfs --environment d1_mini
   environment:
     hostname:
       from_secret: hostname
@@ -33,15 +26,23 @@ steps:
       from_secret: iotssid
     iotpwd:
       from_secret: iotpwd    
+- name: build
+  image: sglahn/platformio-core
+    # - pip install -U platformio
+    # Build image
+    - platformio run --environment d1_mini
+    # Build file system image
+    - platformio run --target buildfs --environment d1_mini
 - name: upload
-  image: python:3.10
+  image: alpine
   commands:
+    - lastknownip=$(cat lastknownip)
     # Upload image with espota-gateway
     - |
-      curl -k --request POST --url "https://espota.ctdo.de/" --header "Content-Type: multipart/form-data" --form ip="$lastknownip" --form firmware=@.pio/build/d1_mini/firmware.bin -N
+      curl --insecure --fail-with-body --request POST --url "https://espota.ctdo.de/" --header "Content-Type: multipart/form-data" --form ip="$lastknownip" --form firmware=@.pio/build/d1_mini/firmware.bin -N
     # TODO: Upload file system image with espota-gateway, if the device is available again (or leave it to espota-gateway to retry often enough)
     - |
-      curl -k --request POST --url "https://espota.ctdo.de/" --header "Content-Type: multipart/form-data" --form ip="$lastknownip" --form spiffs=@.pio/build/d1_mini/spiffs.bin -N
+      curl --insecure --fail-with-body --request POST --url "https://espota.ctdo.de/" --header "Content-Type: multipart/form-data" --form ip="$lastknownip" --form spiffs=@.pio/build/d1_mini/spiffs.bin -N
 
 
 ### matrix-builds? -  for multiple volumeknobs?