Skip to content

Commit

Permalink
Update-deployment (home-assistant#2281)
Browse files Browse the repository at this point in the history
* Update deployment

* fix workflow

* Fix order

* restruct v1

* Fix style v2

* Cleanup style v3

* fix style v4

* Last style fix

* Address comments

* Update builder to 2021.11.3

* Fix let's encrypt

* fix lint

* Use ghcr.io

* fix

* Update versions

* fix readme
  • Loading branch information
pvizeli authored Nov 24, 2021
1 parent fe641df commit 69c68bf
Show file tree
Hide file tree
Showing 96 changed files with 1,190 additions and 1,189 deletions.
25 changes: 11 additions & 14 deletions .github/workflows/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build add-on

env:
BUILD_ARGS: "--test"
MONITORED_FILES: "apparmor.txt build.json config.json Dockerfile data rootfs"
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"

on:
pull_request:
Expand Down Expand Up @@ -30,7 +30,7 @@ jobs:
id: addons
run: |
declare -a addons
for addon in $(find ./ -name config.json | cut -d "/" -f2 | sort -u); do
for addon in $(find ./ -name config.yaml | cut -d "/" -f2 | sort -u); do
addons+=("$addon");
done
echo "::set-output name=addons::${addons[@]}"
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
if: needs.init.outputs.changed == 'true'
name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on
strategy:
matrix:
matrix:
addon: ${{ fromJson(needs.init.outputs.changed_addons) }}
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]

Expand All @@ -83,14 +83,11 @@ jobs:
- name: Check add-on
id: check
run: |
if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then
echo "::set-output name=build_arch::true";
else
echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build";
fi
version=$(jq -r '.version' "./${{ matrix.addon }}/config.json")
echo "::set-output name=version::${version}";
if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then
echo "::set-output name=build_arch::true";
else
echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build";
fi
- name: Set build arguments
if: steps.check.outputs.build_arch == 'true'
Expand All @@ -116,12 +113,12 @@ jobs:

- name: Build ${{ matrix.addon }} add-on
if: steps.check.outputs.build_arch == 'true'
uses: home-assistant/builder@2021.09.0
uses: home-assistant/builder@2021.11.3
with:
args: |
${{ env.BUILD_ARGS }} \
--${{ matrix.arch }} \
--target /data/${{ matrix.addon }} \
--with-codenotary "${{ secrets.VCN_USER }}" "${{ secrets.VCN_PASSWORD }}" "${{ secrets.VCN_ORG }}" \
--validate-from "${{ secrets.VCN_ORG }}" \
--addon
env:
CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
1 change: 1 addition & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ ignored:
- DL3018
- DL4006
- SC2046
- SC2086
10 changes: 0 additions & 10 deletions ada/build.json

This file was deleted.

9 changes: 9 additions & 0 deletions ada/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
build_from:
amd64: ghcr.io/home-assistant/amd64-base-debian:buster
armhf: ghcr.io/home-assistant/armhf-base-debian:buster
armv7: ghcr.io/home-assistant/armv7-base-debian:buster
codenotary:
signer: [email protected]
base_image: [email protected]
args:
ADA_VERSION: 0.8.1
21 changes: 0 additions & 21 deletions ada/config.json

This file was deleted.

20 changes: 20 additions & 0 deletions ada/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 1.1.1
slug: ada
name: Hey Ada!
description: Voice assistant powered by Home Assistant
url: https://github.com/home-assistant/hassio-addons/blob/master/ada
arch:
- armhf
- armv7
- amd64
audio: true
homeassistant: 0.102.0
homeassistant_api: true
image: homeassistant/{arch}-addon-ada
init: false
options:
stt: cloud
tts: cloud
schema:
stt: str
tts: str
10 changes: 0 additions & 10 deletions almond/build.json

This file was deleted.

9 changes: 9 additions & 0 deletions almond/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base-debian:buster
amd64: ghcr.io/home-assistant/amd64-base-debian:buster
armv7: ghcr.io/home-assistant/armv7-base-debian:buster
codenotary:
signer: [email protected]
base_image: [email protected]
args:
ALMOND_VERSION: v2.0.1
16 changes: 0 additions & 16 deletions almond/config.json

This file was deleted.

18 changes: 18 additions & 0 deletions almond/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 2.0.1
slug: almond
name: Almond
description: The open-source, privacy-preserving voice assistant
url: https://github.com/home-assistant/hassio-addons/blob/master/almond
arch:
- armv7
- aarch64
- amd64
audio: true
discovery:
- almond
homeassistant: 0.102.0
homeassistant_api: true
image: homeassistant/{arch}-addon-almond
ingress: true
init: false
panel_icon: mdi:comment-eye-outline
12 changes: 0 additions & 12 deletions cec_scan/build.json

This file was deleted.

11 changes: 11 additions & 0 deletions cec_scan/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base:3.14
amd64: ghcr.io/home-assistant/amd64-base:3.14
armhf: ghcr.io/home-assistant/armhf-base:3.14
armv7: ghcr.io/home-assistant/armv7-base:3.14
i386: ghcr.io/home-assistant/i386-base:3.14
codenotary:
signer: [email protected]
base_image: [email protected]
args:
LIBCEC_VERSION: 6.0.2
14 changes: 0 additions & 14 deletions cec_scan/config.json

This file was deleted.

17 changes: 17 additions & 0 deletions cec_scan/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: "3.0"
slug: cec_scan
name: CEC Scanner
url: https://github.com/home-assistant/hassio-addons/tree/master/cec_scan
arch:
- armhf
- armv7
- aarch64
- amd64
- i386
boot: manual
description: Scan for HDMI CEC devices
image: homeassistant/{arch}-addon-cec_scan
options: {}
schema: {}
startup: once
video: true
9 changes: 0 additions & 9 deletions check_config/build.json

This file was deleted.

9 changes: 9 additions & 0 deletions check_config/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
build_from:
aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2021.09.0
amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2021.09.0
armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2021.09.0
armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2021.09.0
i386: ghcr.io/home-assistant/i386-homeassistant-base:2021.09.0
codenotary:
signer: [email protected]
base_image: [email protected]
21 changes: 0 additions & 21 deletions check_config/config.json

This file was deleted.

26 changes: 26 additions & 0 deletions check_config/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: 3.9.0
slug: check_config
name: Check Home Assistant configuration
description: Check your Home Assistant configuration against other versions
url: https://github.com/home-assistant/hassio-addons/tree/master/check_config
arch:
- armhf
- armv7
- aarch64
- amd64
- i386
boot: manual
image: homeassistant/{arch}-addon-check_config
init: false
map:
- config
- ssl
- media
- share:rw
options:
version: stable
schema:
version: str
startup: once
uart: true
usb: true
12 changes: 0 additions & 12 deletions configurator/build.json

This file was deleted.

11 changes: 11 additions & 0 deletions configurator/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base:3.14
amd64: ghcr.io/home-assistant/amd64-base:3.14
armhf: ghcr.io/home-assistant/armhf-base:3.14
armv7: ghcr.io/home-assistant/armv7-base:3.14
i386: ghcr.io/home-assistant/i386-base:3.14
codenotary:
signer: [email protected]
base_image: [email protected]
args:
CONFIGURATOR_VERSION: 0.4.1
29 changes: 0 additions & 29 deletions configurator/config.json

This file was deleted.

Loading

0 comments on commit 69c68bf

Please sign in to comment.