Skip to content

Commit 2a28022

Browse files
authored
🔧 Workflow cleanup, release drafter restore, and bashio v0.18 compat (#691)
1 parent 31596e9 commit 2a28022

10 files changed

Lines changed: 29 additions & 57 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ on:
1212

1313
permissions:
1414
actions: read
15-
contents: write
15+
contents: read
1616
packages: read
17-
pull-requests: read
1817
security-events: write
1918

2019
jobs:
2120
workflows:
22-
uses: hassio-addons/workflows/.github/workflows/app-ci.yaml@3846ae0fd09acec8ac1ac308ceacd052b9d01bec # v2.0.6
21+
uses: hassio-addons/workflows/.github/workflows/app-ci.yaml@383c10d83acbe341acbb35a4a61bfd14827f00f0 # v3.0.0

‎.github/workflows/deploy.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@ jobs:
1616
ci:
1717
permissions:
1818
actions: read
19-
contents: write
19+
contents: read
2020
packages: read
21-
pull-requests: read
2221
security-events: write
23-
uses: hassio-addons/workflows/.github/workflows/app-ci.yaml@3846ae0fd09acec8ac1ac308ceacd052b9d01bec # v2.0.6
22+
uses: hassio-addons/workflows/.github/workflows/app-ci.yaml@383c10d83acbe341acbb35a4a61bfd14827f00f0 # v3.0.0
2423

2524
deploy:
2625
needs: ci
2726
permissions:
2827
contents: read
2928
packages: write
30-
uses: hassio-addons/workflows/.github/workflows/app-deploy.yaml@3846ae0fd09acec8ac1ac308ceacd052b9d01bec # v2.0.6
29+
uses: hassio-addons/workflows/.github/workflows/app-deploy.yaml@383c10d83acbe341acbb35a4a61bfd14827f00f0 # v3.0.0
3130
secrets:
3231
DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}

‎.github/workflows/labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ permissions:
1212

1313
jobs:
1414
workflows:
15-
uses: hassio-addons/workflows/.github/workflows/labels.yaml@3846ae0fd09acec8ac1ac308ceacd052b9d01bec # v2.0.6
15+
uses: hassio-addons/workflows/.github/workflows/labels.yaml@383c10d83acbe341acbb35a4a61bfd14827f00f0 # v3.0.0

‎.github/workflows/lock.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.github/workflows/pr-labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ permissions: {}
1414

1515
jobs:
1616
workflows:
17-
uses: hassio-addons/workflows/.github/workflows/pr-labels.yaml@3846ae0fd09acec8ac1ac308ceacd052b9d01bec # v2.0.6
17+
uses: hassio-addons/workflows/.github/workflows/pr-labels.yaml@383c10d83acbe341acbb35a4a61bfd14827f00f0 # v3.0.0
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Release Drafter
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
push:
7+
branches:
8+
- main
9+
10+
permissions:
11+
contents: write
12+
pull-requests: read
13+
14+
jobs:
15+
workflows:
16+
uses: hassio-addons/workflows/.github/workflows/release-drafter.yaml@383c10d83acbe341acbb35a4a61bfd14827f00f0 # v3.0.0

‎.github/workflows/stale.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎README.md‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
![Project Stage][project-stage-shield]
55
[![License][license-shield]](LICENSE.md)
66

7-
![Supports aarch64 Architecture][aarch64-shield]
8-
![Supports amd64 Architecture][amd64-shield]
9-
107
[![Github Actions][github-actions-shield]][github-actions]
118
![Project Maintenance][maintenance-shield]
129
[![GitHub Activity][commits-shield]][commits]
1310

14-
[![Discord][discord-shield]][discord]
15-
[![Community Forum][forum-shield]][forum]
16-
1711
[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
1812

1913
[![Support Frenck on Patreon][patreon-shield]][patreon]
@@ -97,17 +91,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
9791
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
9892
SOFTWARE.
9993

100-
[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
101-
[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
10294
[commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/app-adguard-home.svg
10395
[commits]: https://github.com/hassio-addons/app-adguard-home/commits/main
10496
[contributors]: https://github.com/hassio-addons/app-adguard-home/graphs/contributors
10597
[discord-ha]: https://discord.gg/c5DvZ4e
106-
[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
10798
[discord]: https://discord.me/hassioaddons
10899
[dockerhub]: https://hub.docker.com/r/hassioaddons/adguard
109100
[docs]: https://github.com/hassio-addons/app-adguard-home/blob/main/adguard/DOCS.md
110-
[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
111101
[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-adguard-home/90684?u=frenck
112102
[frenck]: https://github.com/frenck
113103
[github-actions-shield]: https://github.com/hassio-addons/app-adguard-home/workflows/CI/badge.svg

‎adguard/rootfs/etc/s6-overlay/s6-rc.d/init-adguard/run‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if ! bashio::fs.file_exists "${CONFIG}"; then
1818
cp /etc/adguard/AdGuardHome.yaml "${CONFIG}"
1919
fi
2020

21-
port=$(bashio::addon.port "53/udp") \
21+
port=$(bashio::app.port "53/udp") \
2222
yq e --inplace '.dns.port = env(port)' "${CONFIG}" \
2323
|| bashio::exit.nok 'Failed updating AdGuardHome DNS port'
2424

@@ -76,7 +76,7 @@ for interface in "${interfaces[@]}"; do
7676

7777
done
7878
# Bind to app IP address
79-
hosts+=($(bashio::addon.ip_address))
79+
hosts+=($(bashio::app.ip_address))
8080
# Bind to localhost ip addresses as well.
8181
hosts+=("127.0.0.1")
8282
hosts+=("::1")

‎adguard/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ bashio::var.json \
2727

2828
# Generate Ingress configuration
2929
bashio::var.json \
30-
interface "$(bashio::addon.ip_address)" \
31-
port "^$(bashio::addon.ingress_port)" \
30+
interface "$(bashio::app.ip_address)" \
31+
port "^$(bashio::app.ingress_port)" \
3232
protocol "${adguard_protocol}" \
3333
| tempio \
3434
-template /etc/nginx/templates/ingress.gtpl \
3535
-out /etc/nginx/servers/ingress.conf
3636

3737
# Generate direct access configuration, if enabled.
38-
if bashio::var.has_value "$(bashio::addon.port 80)"; then
38+
if bashio::var.has_value "$(bashio::app.port 80)"; then
3939
bashio::config.require.ssl
4040
bashio::var.json \
4141
certfile "$(bashio::config 'certfile')" \
4242
keyfile "$(bashio::config 'keyfile')" \
4343
leave_front_door_open "^$(bashio::config 'leave_front_door_open')" \
44-
port "^$(bashio::addon.port 80)" \
44+
port "^$(bashio::app.port 80)" \
4545
protocol "${adguard_protocol}" \
4646
ssl "^$(bashio::config 'ssl')" \
4747
| tempio \

0 commit comments

Comments
 (0)