From a0e87e28ba7d4683b873d6d53ee8682d5fb6b84a Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Tue, 28 May 2019 09:20:26 +0200 Subject: [PATCH] Fix beta slug --- esphome-beta/config.json | 37 +++++++++++++++++++------------------ esphome-dev/build.json | 8 ++++---- esphome-dev/config.json | 40 ++++++++++++++++++++-------------------- script/generate.py | 4 ++-- template/config.yaml | 12 ++++++++---- 5 files changed, 53 insertions(+), 48 deletions(-) diff --git a/esphome-beta/config.json b/esphome-beta/config.json index f7ae00b..9c61f50 100644 --- a/esphome-beta/config.json +++ b/esphome-beta/config.json @@ -1,46 +1,47 @@ { - "url": "https://esphome.io/", - "webui": "http://[HOST]:[PORT:6052]", - "startup": "application", - "boot": "auto", "arch": [ "amd64", "i386", "armv7", "aarch64" ], - "hassio_api": true, "auth_api": true, + "auto_uart": true, + "boot": "auto", + "description": "Beta version of ESPHome Hass.io add-on.", + "hassio_api": true, "hassio_role": "default", "homeassistant_api": false, "host_network": true, + "image": "esphome/esphome-hassio-{arch}", "ingress": true, "ingress_port": 0, + "map": [ + "ssl:ro", + "config:rw" + ], + "name": "ESPHome (beta)", + "options": {}, "panel_icon": "mdi:chip", - "auto_uart": true, "ports": { "6052/tcp": null }, "ports_description": { "6052/tcp": "Web interface (Not required for Hass.io Ingress)" }, - "map": [ - "ssl", - "config:rw" - ], "schema": { - "ssl": "bool?", "certfile": "str?", + "esphome_version": "str?", "keyfile": "str?", "leave_front_door_open": "bool?", - "esphome_version": "str?", - "streamer_mode": "bool?", "relative_url": "str?", - "status_use_ping": "bool?" + "ssl": "bool?", + "status_use_ping": "bool?", + "streamer_mode": "bool?" }, - "name": "ESPHome (beta)", + "slug": "esphome-beta", + "startup": "application", + "url": "https://beta.esphome.io/", "version": "1.13.0b1", - "description": "Beta version of ESPHome Hass.io add-on.", - "image": "esphome/esphome-hassio-{arch}", - "options": {} + "webui": "http://[HOST]:[PORT:6052]" } \ No newline at end of file diff --git a/esphome-dev/build.json b/esphome-dev/build.json index 989c441..581b8dc 100644 --- a/esphome-dev/build.json +++ b/esphome-dev/build.json @@ -1,10 +1,10 @@ { - "squash": false, + "args": {}, "build_from": { + "aarch64": "esphome/esphome-hassio-base-aarch64:1.6.0", "amd64": "esphome/esphome-hassio-base-amd64:1.6.0", - "i386": "esphome/esphome-hassio-base-i386:1.6.0", "armv7": "esphome/esphome-hassio-base-armv7:1.6.0", - "aarch64": "esphome/esphome-hassio-base-aarch64:1.6.0" + "i386": "esphome/esphome-hassio-base-i386:1.6.0" }, - "args": {} + "squash": false } \ No newline at end of file diff --git a/esphome-dev/config.json b/esphome-dev/config.json index ec78fbe..69c0515 100644 --- a/esphome-dev/config.json +++ b/esphome-dev/config.json @@ -1,48 +1,48 @@ { - "url": "https://esphome.io/", - "webui": "http://[HOST]:[PORT:6052]", - "startup": "application", - "boot": "auto", "arch": [ "amd64", "i386", "armv7", "aarch64" ], - "hassio_api": true, "auth_api": true, + "auto_uart": true, + "boot": "auto", + "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files", + "hassio_api": true, "hassio_role": "default", "homeassistant_api": false, "host_network": true, "ingress": true, "ingress_port": 0, + "map": [ + "ssl:ro", + "config:rw" + ], + "name": "ESPHome (dev)", + "options": { + "esphome_version": "dev" + }, "panel_icon": "mdi:chip", - "auto_uart": true, "ports": { "6052/tcp": null }, "ports_description": { "6052/tcp": "Web interface (Not required for Hass.io Ingress)" }, - "map": [ - "ssl", - "config:rw" - ], "schema": { - "ssl": "bool?", "certfile": "str?", + "esphome_version": "str?", "keyfile": "str?", "leave_front_door_open": "bool?", - "esphome_version": "str?", - "streamer_mode": "bool?", "relative_url": "str?", - "status_use_ping": "bool?" + "ssl": "bool?", + "status_use_ping": "bool?", + "streamer_mode": "bool?" }, - "name": "ESPHome (dev)", - "version": "dev", "slug": "esphome-dev", - "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files", - "options": { - "esphome_version": "dev" - } + "startup": "application", + "url": "https://next.esphome.io/", + "version": "dev", + "webui": "http://[HOST]:[PORT:6052]" } \ No newline at end of file diff --git a/script/generate.py b/script/generate.py index 4e1a7ab..784e253 100755 --- a/script/generate.py +++ b/script/generate.py @@ -30,7 +30,7 @@ for channel in args.channels: dir_ = root / conf.pop('directory') path = dir_ / 'config.json' with open(path, 'w') as f: - json.dump(conf, f, indent=2) + json.dump(conf, f, indent=2, sort_keys=True) for file_, conf_ in copyf.items(): copyfile(templ / file_, dir_ / file_) @@ -43,6 +43,6 @@ for channel in args.channels: "args": {} } with open(path, 'w') as f: - json.dump(build_conf, f, indent=2) + json.dump(build_conf, f, indent=2, sort_keys=True) print(f"Wrote {path}") diff --git a/template/config.yaml b/template/config.yaml index 5a361e5..a970012 100644 --- a/template/config.yaml +++ b/template/config.yaml @@ -28,7 +28,7 @@ base: &base ports_description: '6052/tcp': "Web interface (Not required for Hass.io Ingress)" map: - - ssl + - ssl:ro - config:rw schema: ssl: bool? @@ -45,9 +45,10 @@ esphome-dev: <<: *base directory: esphome-dev name: ESPHome (dev) - version: dev + version: 'dev' # DEV slug: esphome-dev description: "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" + url: https://next.esphome.io/ options: esphome_version: dev @@ -55,8 +56,10 @@ esphome-beta: <<: *base directory: esphome-beta name: ESPHome (beta) - version: 1.13.0b1 # BETA + version: '1.13.0b1' # BETA + slug: esphome-beta description: "Beta version of ESPHome Hass.io add-on." + url: https://beta.esphome.io/ image: esphome/esphome-hassio-{arch} options: {} @@ -64,7 +67,8 @@ esphome-stable: <<: *base directory: esphome name: ESPHome - version: 1.12.2 # STABLE + version: '1.12.2' # STABLE + slug: esphome description: "ESPHome Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices." image: esphome/esphome-hassio-{arch} options: {}