Skip to content

Commit

Permalink
Merge branch 'current' into patch-94
Browse files Browse the repository at this point in the history
  • Loading branch information
Hedda authored Nov 24, 2023
2 parents ae9b255 + 415db21 commit cbd7a36
Show file tree
Hide file tree
Showing 1,402 changed files with 26,862 additions and 7,279 deletions.
38 changes: 21 additions & 17 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@
"appPort": [4000],
"onCreateCommand": "bundle install && npm install",
"containerEnv": { "DEVCONTAINER": "true" },
"extensions": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"GitHub.vscode-pull-request-github",
"mrmlnc.vscode-scss",
"rebornix.Ruby",
"streetsidesoftware.code-spell-checker",
"taichi.vscode-textlint",
"yzhang.markdown-all-in-one"
],
"settings": {
"editor.renderWhitespace": "boundary",
"editor.rulers": [80, 100, 120],
"gitlens.showWelcomeOnInstall": false,
"gitlens.showWhatsNewAfterUpgrades": false,
"terminal.integrated.shell.linux": "/usr/bin/zsh",
"workbench.startupEditor": "none"
"customizations": {
"vscode": {
"extensions": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"GitHub.vscode-pull-request-github",
"mrmlnc.vscode-scss",
"rebornix.Ruby",
"streetsidesoftware.code-spell-checker",
"taichi.vscode-textlint",
"yzhang.markdown-all-in-one"
],
"settings": {
"editor.renderWhitespace": "boundary",
"editor.rulers": [80, 100, 120],
"gitlens.showWelcomeOnInstall": false,
"gitlens.showWhatsNewAfterUpgrades": false,
"terminal.integrated.shell.linux": "/usr/bin/zsh",
"workbench.startupEditor": "none"
}
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/add_prs_to_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Generate app token
id: token
# Pinned to a specific version of the action for security reasons
uses: tibdex/github-app-token@0914d50df753bbc42180d982a6550f195390069f # v2.0.0
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
with:
app_id: ${{ secrets.PROJECTS_APP_ID }}
private_key: ${{ secrets.PROJECTS_APP_PEM }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v4.0.1
- uses: dessant/lock-threads@v5.0.1
if: ${{ github.repository_owner == 'home-assistant' }}
with:
github-token: ${{ github.token }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out files from GitHub
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
- name: Setting up Node.js
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: 16.x
cache: "npm"
Expand All @@ -25,9 +25,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out files from GitHub
uses: actions/checkout@v4.0.0
uses: actions/checkout@v4.1.1
- name: Setting up Node.js
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: 16.x
cache: "npm"
Expand Down
2 changes: 1 addition & 1 deletion .textlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"ViCare",
"Viessmann",
"VIVOTEK",
"Vizio",
"VIZIO",
"Vultr",
"WebDAV",
"WeMo",
Expand Down
78 changes: 50 additions & 28 deletions CODEOWNERS

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '> 2.5.0'

group :development do
gem 'rake', '13.0.6'
gem 'rake', '13.1.0'
gem 'jekyll', '4.3.2'
gem 'compass', '1.0.3'
gem 'sass-globbing', '1.1.5'
Expand All @@ -20,7 +20,7 @@ group :jekyll_plugins do
end

gem 'sinatra', '3.1.0'
gem 'nokogiri', '1.15.4'
gem 'nokogiri', '1.15.5'

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library
Expand Down
25 changes: 12 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ GEM
http_parser.rb (~> 0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.15.5)
ffi (1.15.5-x64-mingw32)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.24.3)
google-protobuf (3.25.1)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -68,26 +67,26 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.4)
mini_portile2 (2.8.5)
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
nokogiri (1.15.4)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.3)
racc (1.7.1)
public_suffix (5.0.4)
racc (1.7.3)
rack (2.2.8)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rake (13.0.6)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (4.1.3)
rouge (4.2.0)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sass (3.4.25)
Expand All @@ -110,12 +109,12 @@ GEM
stringex (2.8.6)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tilt (2.2.0)
tilt (2.3.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
Expand All @@ -129,8 +128,8 @@ DEPENDENCIES
jekyll-paginate (= 1.1.0)
jekyll-sitemap (= 1.4.0)
jekyll-toc (= 0.18.0)
nokogiri (= 1.15.4)
rake (= 13.0.6)
nokogiri (= 1.15.5)
rake (= 13.1.0)
sass-globbing (= 1.1.5)
sassc (= 2.1.0)
sinatra (= 3.1.0)
Expand Down
13 changes: 3 additions & 10 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ social:

# Home Assistant release details
current_major_version: 2023
current_minor_version: 9
current_patch_version: 1
date_released: 2023-09-08
current_minor_version: 11
current_patch_version: 3
date_released: 2023-11-22

# Either # or the anchor link to latest release notes in the blog post.
# Must be prefixed with a # and have double quotes around it.
Expand Down Expand Up @@ -221,13 +221,6 @@ installation:
- name: "Raspberry Pi 3"
key: "rpi3-64"

tinkerboard:
board: ASUS Tinkerboard
installation_media: "eMMC module or SD card"
variants:
- name: "ASUS Tinkerboard"
key: "tinker"

generic-x86-64:
board: Generic x86-64
installation_media: "storage device"
Expand Down
Loading

0 comments on commit cbd7a36

Please sign in to comment.