Skip to content

Commit 9ca7764

Browse files
authored
Merge branch 'current' into mobile-nav-fix
2 parents b9b027e + 22faa44 commit 9ca7764

File tree

5 files changed

+45
-45
lines changed

5 files changed

+45
-45
lines changed

.github/workflows/ci.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
pull_request:
5-
types: [opened, reopened, synchronize]
5+
types: [opened, edited, reopened, synchronize]
66

77
permissions:
88
contents: read
@@ -40,3 +40,30 @@ jobs:
4040

4141
- name: Run production build
4242
run: make production
43+
lint:
44+
name: Lint
45+
runs-on: ubuntu-latest
46+
steps:
47+
- name: Checkout
48+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
49+
50+
- name: Set up Python 3.12
51+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
52+
with:
53+
python-version: 3.12
54+
55+
- name: Install dependencies
56+
run: pip install -r requirements_test.txt
57+
58+
- name: Register problem matchers
59+
run: |
60+
echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
61+
62+
- name: markdownlint-cli
63+
uses: nosborn/github-action-markdown-cli@508d6cefd8f0cc99eab5d2d4685b1d5f470042c1 # v3.5.0
64+
with:
65+
config_file: ".markdownlintrc"
66+
files: .
67+
68+
- name: Lint
69+
run: python lint.py

.github/workflows/lint.yml

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

content/changelog/2025.10.0.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,18 @@ continue working, but custom components and advanced setups may require updates.
396396

397397
</details>
398398

399+
## Release 2025.10.5 - November 11
400+
401+
<details>
402+
<summary></summary>
403+
404+
- [const] Add CONF_ROWS [esphome#11249](https://github.com/esphome/esphome/pull/11249) by [@stuartparmenter](https://github.com/stuartparmenter)
405+
- [core] Don't allow python 3.14 [esphome#11527](https://github.com/esphome/esphome/pull/11527) by [@swoboda1337](https://github.com/swoboda1337)
406+
- [usb_uart] Fixes for transfer queue allocation [esphome#11548](https://github.com/esphome/esphome/pull/11548) by [@clydebarrow](https://github.com/clydebarrow)
407+
- [lvgl] Fix rotation with unusual width [esphome#11680](https://github.com/esphome/esphome/pull/11680) by [@clydebarrow](https://github.com/clydebarrow)
408+
409+
</details>
410+
399411
## Full list of changes
400412

401413
### New Features

content/guides/supporters.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ ESPHome was originally founded by [Otto Winter (@OttoWinter)](https://github.com
6565
- [Ian Blais (@aeonsablaze)](https://github.com/aeonsablaze)
6666
- [Johan Bloemberg (@aequitas)](https://github.com/aequitas)
6767
- [Andrew Erickson (@aerickson)](https://github.com/aerickson)
68+
- [Ben (@af3556)](https://github.com/af3556)
6869
- [Attila Farago (@afarago)](https://github.com/afarago)
6970
- [Kjell Braden (@afflux)](https://github.com/afflux)
7071
- [Alejandro Galfrascoli (@AGalfra)](https://github.com/AGalfra)
@@ -952,6 +953,7 @@ ESPHome was originally founded by [Otto Winter (@OttoWinter)](https://github.com
952953
- [Jake Crosby (@jake-nz)](https://github.com/jake-nz)
953954
- [jakehdk (@jakehdk)](https://github.com/jakehdk)
954955
- [Jake Shirley (@JakeShirley)](https://github.com/JakeShirley)
956+
- [Jakob S. (@jakicoll)](https://github.com/jakicoll)
955957
- [Jonathan Kollasch (@jakllsch)](https://github.com/jakllsch)
956958
- [Jakob Reiter (@jakommo)](https://github.com/jakommo)
957959
- [jakub-medrzak (@jakub-medrzak)](https://github.com/jakub-medrzak)
@@ -1279,6 +1281,7 @@ ESPHome was originally founded by [Otto Winter (@OttoWinter)](https://github.com
12791281
- [Piotr Majkrzak (@majkrzak)](https://github.com/majkrzak)
12801282
- [Major Péter (@majorpeter)](https://github.com/majorpeter)
12811283
- [Dmitry (@mak-42)](https://github.com/mak-42)
1284+
- [Makerfabs (@Makerfabs)](https://github.com/Makerfabs)
12821285
- [Max Slotov (@makstech)](https://github.com/makstech)
12831286
- [Kasper Malfroid (@malfroid)](https://github.com/malfroid)
12841287
- [Malle355 (@Malle355)](https://github.com/Malle355)
@@ -2268,4 +2271,4 @@ ESPHome was originally founded by [Otto Winter (@OttoWinter)](https://github.com
22682271
- [Christian Zufferey (@zuzu59)](https://github.com/zuzu59)
22692272
- [Zynth-dev (@Zynth-dev)](https://github.com/Zynth-dev)
22702273

2271-
*This page was last updated November 4, 2025.*
2274+
*This page was last updated November 11, 2025.*

data/version.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
release: 2025.10.4
1+
release: 2025.10.5
22
version: '2025.10'

0 commit comments

Comments
 (0)