Fix gitlab

This commit is contained in:
Otto Winter 2018-11-25 21:00:20 +01:00
parent 44db018d4f
commit 418234c622
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
2 changed files with 30 additions and 21 deletions

View File

@ -26,9 +26,6 @@ stages:
- esphomeyaml-test
variables:
TZ: UTC
cache:
paths:
- tests/build
.docker-builder: &docker-builder
before_script:
@ -64,7 +61,7 @@ test2:
stage: build
script:
- docker run --rm --privileged hassioaddons/qemu-user-static:latest
- BUILD_FROM=hassioaddons/ubuntu-base-${BUILD_ARCH}:2.2.0
- BUILD_FROM=hassioaddons/ubuntu-base-${ADDON_ARCH}:2.2.0
- ADDON_VERSION="${CI_COMMIT_TAG#v}"
- ADDON_VERSION="${ADDON_VERSION:-${CI_COMMIT_SHA:0:7}}"
- echo "Build from ${BUILD_FROM}"
@ -216,16 +213,16 @@ build:hassio-armhf:
variables:
ADDON_ARCH: armhf
build:hassio-aarch64-edge:
<<: *build-hassio-edge
variables:
ADDON_ARCH: aarch64
DO_PUSH: "false"
#build:hassio-aarch64-edge:
# <<: *build-hassio-edge
# variables:
# ADDON_ARCH: aarch64
# DO_PUSH: "false"
build:hassio-aarch64:
<<: *build-hassio-release
variables:
ADDON_ARCH: aarch64
#build:hassio-aarch64:
# <<: *build-hassio-release
# variables:
# ADDON_ARCH: aarch64
build:hassio-i386-edge:
<<: *build-hassio-edge
@ -260,15 +257,15 @@ deploy-beta:armhf:
variables:
ADDON_ARCH: armhf
deploy-release:aarch64:
<<: *deploy-release
variables:
ADDON_ARCH: aarch64
#deploy-release:aarch64:
# <<: *deploy-release
# variables:
# ADDON_ARCH: aarch64
deploy-beta:aarch64:
<<: *deploy-beta
variables:
ADDON_ARCH: aarch64
#deploy-beta:aarch64:
# <<: *deploy-beta
# variables:
# ADDON_ARCH: aarch64
deploy-release:i386:
<<: *deploy-release

12
docker/platformio.ini Normal file
View File

@ -0,0 +1,12 @@
; This file allows the docker build file to install the required platformio
; platforms
[env:espressif8266]
platform = espressif8266
board = nodemcuv2
framework = arduino
[env:espressif32]
platform = espressif32
board = nodemcu-32s
framework = arduino