1
0

Compare commits

..

73 Commits

14 changed files with 61 additions and 45 deletions

View File

@@ -3,7 +3,12 @@ FROM ghcr.io/home-assistant/devcontainer:addons
RUN \ RUN \
apt-get update \ apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
python3-pip python3-pip \
python3-venv
ENV VIRTUAL_ENV=/opt/venv
RUN python3 -m venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
COPY script/requirements.txt / COPY script/requirements.txt /

View File

@@ -14,23 +14,28 @@
"containerEnv": { "containerEnv": {
"WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}" "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
}, },
"extensions": [ "customizations": {
"timonwong.shellcheck", "vscode": {
"esbenp.prettier-vscode" "extensions": [
], "timonwong.shellcheck",
"mounts": [ "esbenp.prettier-vscode",
"type=volume,target=/var/lib/docker" "ms-python.python"
], ],
"settings": { "mounts": [
"terminal.integrated.profiles.linux": { "type=volume,target=/var/lib/docker"
"zsh": { ],
"path": "/usr/bin/zsh" "settings": {
"terminal.integrated.profiles.linux": {
"zsh": {
"path": "/usr/bin/zsh"
}
},
"terminal.integrated.defaultProfile.linux": "zsh",
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
"editor.formatOnType": true,
"files.trimTrailingWhitespace": true
} }
}, }
"terminal.integrated.defaultProfile.linux": "zsh",
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
"editor.formatOnType": true,
"files.trimTrailingWhitespace": true
} }
} }

View File

@@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
steps: steps:
- uses: actions/checkout@v3.5.3 - uses: actions/checkout@v4.1.1
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4.8.0
with: with:
python-version: '3.x' python-version: '3.11'
- run: pip install -r script/requirements.txt - run: pip install -r script/requirements.txt
- run: script/bump-version.py ${{ github.event.inputs.version }} - run: script/bump-version.py ${{ github.event.inputs.version }}
- name: Write Beta changelog - name: Write Beta changelog

View File

@@ -19,20 +19,20 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3.5.3 - uses: actions/checkout@v4.1.1
- name: Log in to the GitHub container registry - name: Log in to the GitHub container registry
uses: docker/login-action@v2.2.0 uses: docker/login-action@v3.0.0
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0 uses: docker/setup-qemu-action@v3.0.0
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.7.0 uses: docker/setup-buildx-action@v3.0.0
- name: Build and Push - name: Build and Push
uses: docker/build-push-action@v4.1.1 uses: docker/build-push-action@v5.1.0
with: with:
context: . context: .
file: .devcontainer/Dockerfile file: .devcontainer/Dockerfile

View File

@@ -19,16 +19,16 @@ jobs:
channel: dev channel: dev
steps: steps:
- name: ⤵️ Check out code from GitHub - name: ⤵️ Check out code from GitHub
uses: actions/checkout@v3.5.3 uses: actions/checkout@v4.1.1
- name: 🛠 Setup Python - name: 🛠 Setup Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4.8.0
with: with:
python-version: '3.x' python-version: '3.11'
- name: 🛠 Install dependencies - name: 🛠 Install dependencies
run: pip install -r script/requirements.txt run: pip install -r script/requirements.txt
- name: 🛠 Generate files from template - name: 🛠 Generate files from template
run: python script/generate.py ${{ matrix.channels.channel }} run: python script/generate.py ${{ matrix.channels.channel }}
- name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }} - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }}
uses: frenck/action-addon-linter@v2.13.1 uses: frenck/action-addon-linter@v2.15.0
with: with:
path: "./${{ matrix.channels.folder }}" path: "./${{ matrix.channels.folder }}"

View File

@@ -1,5 +1,8 @@
## 2023.6.5 ## 2023.12.2
- Fix bulk and single Bluetooth parser coexistence [esphome#5073](https://github.com/esphome/esphome/pull/5073) by [@bdraco](https://github.com/bdraco) - ESP32-S3 and ESP-IDF don't play well with USB_CDC and need USB_SERIAL_JTAG [esphome#5929](https://github.com/esphome/esphome/pull/5929) by [@clydebarrow](https://github.com/clydebarrow)
- binary_sensor: Validate max_length for on_click/on_double_click [esphome#5068](https://github.com/esphome/esphome/pull/5068) by [@kpfleming](https://github.com/kpfleming) - Update libtiff6 [esphome#5985](https://github.com/esphome/esphome/pull/5985) by [@cvandesande](https://github.com/cvandesande)
- Override GPIOs 12 and 13 on the airm2m (LuatOS) board [esphome#5982](https://github.com/esphome/esphome/pull/5982) by [@davidmonro](https://github.com/davidmonro)
- Add workaround for crash in Arduino 2.0.9 when CDC is configured [esphome#5987](https://github.com/esphome/esphome/pull/5987) by [@kbx81](https://github.com/kbx81)
- web_server.py: return empty content when file doesn't exist [esphome#5980](https://github.com/esphome/esphome/pull/5980) by [@jessicah](https://github.com/jessicah)

View File

@@ -26,13 +26,13 @@ schema:
ssl: bool? ssl: bool?
certfile: str? certfile: str?
keyfile: str? keyfile: str?
relative_url: str?
leave_front_door_open: bool? leave_front_door_open: bool?
backup_exclude: backup_exclude:
- '*/*/' - '*/*/'
init: false init: false
startup: services
name: ESPHome (beta) name: ESPHome (beta)
version: 2023.6.5 version: 2023.12.2
slug: esphome-beta slug: esphome-beta
description: Beta version of ESPHome add-on description: Beta version of ESPHome add-on
image: ghcr.io/esphome/esphome-hassio image: ghcr.io/esphome/esphome-hassio

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 69 KiB

View File

@@ -27,11 +27,11 @@ schema:
ssl: bool? ssl: bool?
certfile: str? certfile: str?
keyfile: str? keyfile: str?
relative_url: str?
leave_front_door_open: bool? leave_front_door_open: bool?
backup_exclude: backup_exclude:
- '*/*/' - '*/*/'
init: false init: false
startup: services
name: ESPHome (dev) name: ESPHome (dev)
version: dev version: dev
slug: esphome-dev slug: esphome-dev

View File

@@ -1,5 +1,8 @@
## 2023.6.5 ## 2023.12.2
- Fix bulk and single Bluetooth parser coexistence [esphome#5073](https://github.com/esphome/esphome/pull/5073) by [@bdraco](https://github.com/bdraco) - ESP32-S3 and ESP-IDF don't play well with USB_CDC and need USB_SERIAL_JTAG [esphome#5929](https://github.com/esphome/esphome/pull/5929) by [@clydebarrow](https://github.com/clydebarrow)
- binary_sensor: Validate max_length for on_click/on_double_click [esphome#5068](https://github.com/esphome/esphome/pull/5068) by [@kpfleming](https://github.com/kpfleming) - Update libtiff6 [esphome#5985](https://github.com/esphome/esphome/pull/5985) by [@cvandesande](https://github.com/cvandesande)
- Override GPIOs 12 and 13 on the airm2m (LuatOS) board [esphome#5982](https://github.com/esphome/esphome/pull/5982) by [@davidmonro](https://github.com/davidmonro)
- Add workaround for crash in Arduino 2.0.9 when CDC is configured [esphome#5987](https://github.com/esphome/esphome/pull/5987) by [@kbx81](https://github.com/kbx81)
- web_server.py: return empty content when file doesn't exist [esphome#5980](https://github.com/esphome/esphome/pull/5980) by [@jessicah](https://github.com/jessicah)

View File

@@ -26,13 +26,13 @@ schema:
ssl: bool? ssl: bool?
certfile: str? certfile: str?
keyfile: str? keyfile: str?
relative_url: str?
leave_front_door_open: bool? leave_front_door_open: bool?
backup_exclude: backup_exclude:
- '*/*/' - '*/*/'
init: false init: false
startup: services
name: ESPHome name: ESPHome
version: 2023.6.5 version: 2023.12.2
slug: esphome slug: esphome
description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
image: ghcr.io/esphome/esphome-hassio image: ghcr.io/esphome/esphome-hassio

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 69 KiB

View File

@@ -34,12 +34,13 @@ base: &base
ssl: bool? ssl: bool?
certfile: str? certfile: str?
keyfile: str? keyfile: str?
relative_url: str?
leave_front_door_open: bool? leave_front_door_open: bool?
backup_exclude: backup_exclude:
- "*/*/" - "*/*/"
# Disable docker init for s6 # Disable docker init for s6
init: false init: false
# Make sure dashboard is available for core
startup: services
esphome-dev: esphome-dev:
<<: *base <<: *base
@@ -60,7 +61,6 @@ esphome-dev:
ssl: bool? ssl: bool?
certfile: str? certfile: str?
keyfile: str? keyfile: str?
relative_url: str?
leave_front_door_open: bool? leave_front_door_open: bool?
base_image: ghcr.io/esphome/esphome-hassio:dev base_image: ghcr.io/esphome/esphome-hassio:dev
options: options:
@@ -70,7 +70,7 @@ esphome-beta:
<<: *base <<: *base
directory: esphome-beta directory: esphome-beta
name: ESPHome (beta) name: ESPHome (beta)
version: '2023.6.5' # BETA version: '2023.12.2' # BETA
slug: esphome-beta slug: esphome-beta
description: "Beta version of ESPHome add-on" description: "Beta version of ESPHome add-on"
url: https://beta.esphome.io/ url: https://beta.esphome.io/
@@ -84,7 +84,7 @@ esphome-stable:
<<: *base <<: *base
directory: esphome directory: esphome
name: ESPHome name: ESPHome
version: '2023.6.5' # STABLE version: '2023.12.2' # STABLE
slug: esphome slug: esphome
description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices" description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
image: ghcr.io/esphome/esphome-hassio image: ghcr.io/esphome/esphome-hassio

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 69 KiB