Skip to content

Commit

Permalink
Merge branch 'home-assistant:current' into current
Browse files Browse the repository at this point in the history
  • Loading branch information
johanf85 authored Jun 18, 2024
2 parents 3f40522 + c64e72d commit e52516f
Show file tree
Hide file tree
Showing 3,418 changed files with 228,504 additions and 56,276 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 1 addition & 4 deletions Dockerfile → .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}

ARG NODE_VERSION="lts/*"
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
RUN su vscode -c "/usr/local/rvm/bin/rvm fix-permissions"

# Locale env vars
ENV \
Expand All @@ -17,7 +18,3 @@ RUN \
ack \
&& echo "en_US UTF-8" > /etc/locale.gen \
&& locale-gen en_US.UTF-8

# Install the specific version of bundler we need
COPY Gemfile.lock ./
RUN gem install bundler -v `awk 'c&&c--;/BUNDLED WITH/{c=1}' Gemfile.lock`
52 changes: 31 additions & 21 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,40 @@
{
"name": "home-assistant.io",
"build": {
"dockerfile": "../Dockerfile",
"dockerfile": "./Dockerfile",
"context": "..",
"args": {
"VARIANT": "2.6",
"NODE_VERSION": "12.1",
"VARIANT": "3.1",
"NODE_VERSION": "20"
}
},
"appPort": [4000],
"postCreateCommand": "bundle install && npm install",
"containerEnv": {"DEVCONTAINER": "true"},
"extensions": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"mrmlnc.vscode-scss",
"rebornix.Ruby",
"streetsidesoftware.code-spell-checker",
"yzhang.markdown-all-in-one"
],
"settings": {
"editor.rulers": [80, 100, 120],
"editor.renderWhitespace": "boundary",
"errorLens.gutterIconsEnabled": true,
"errorLens.addAnnotationTextPrefixes": false,
"errorLens.enabledDiagnosticLevels": ["error", "warning"],
"terminal.integrated.shell.linux": "/usr/bin/zsh",
"onCreateCommand": "bundle install && npm install",
"containerEnv": {
"DEVCONTAINER": "true",
"BUNDLE_PATH": "vendor/bundle"
},
"customizations": {
"vscode": {
"extensions": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"GitHub.vscode-pull-request-github",
"mrmlnc.vscode-scss",
"Shopify.ruby-lsp",
"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",
"rubyLsp.rubyVersionManager": "none"
}
}
}
}
}
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/feedback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
value: |
Thanks for opening an issue to provide feedback on our website/documentation.
Please note, this form is not for reporting bugs with running Home Assistant or its integrations.
**Please note, this form is not for reporting bugs with running Home Assistant or its integrations.**
Those bugs should be reported in the [Home Assistant Core issue tracker][core].
[core]: https://github.com/home-assistant/core/issues
Expand All @@ -24,6 +24,7 @@ body:
value: |
## Details
- type: input
id: url
attributes:
label: URL
placeholder: "http://www.home-assistant.io/..."
Expand All @@ -32,13 +33,13 @@ body:
validations:
required: true
- type: input
id: version
attributes:
label: Version
placeholder: "e.g., 2021.2.0"
placeholder: "e.g., 2022.7.0"
description: >
Current version of the documentation. This usually matches the Home
Assistant Core release version, and can be found at the bottom of the
page.
Latest stable version version of Home Assistant available
(which does not have to match the version you are using).
- type: textarea
attributes:
label: Additional information
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- [ ] Spelling, grammar or other readability improvements (`current` branch).
- [ ] Adjusted missing or incorrect information in the current documentation (`current` branch).
- [ ] Added documentation for a new integration I'm adding to Home Assistant (`next` branch).
- [ ] I've opened up a PR to add logo's and icons in [Brands repository](https://github.com/home-assistant/brands).
- [ ] I've opened up a PR to add logos and icons in [Brands repository](https://github.com/home-assistant/brands).
- [ ] Added documentation for a new feature I'm adding to Home Assistant (`next` branch).
- [ ] Removed stale or deprecated documentation.

Expand All @@ -30,7 +30,7 @@

- Link to parent pull request in the codebase:
- Link to parent pull request in the Brands repository:
- This PR fixes or closes issue:
- This PR fixes or closes issue: fixes #

## Checklist
<!--
Expand All @@ -43,6 +43,6 @@
- [ ] This PR uses the correct branch, based on one of the following:
- I made a change to the existing documentation and used the `current` branch.
- I made a change that is related to an upcoming version of Home Assistant and used the `next` branch.
- [ ] The documentation follows the Home Assistant documentation [standards][].
- [ ] The documentation follows the Home Assistant documentation [standards].

[standards]: https://developers.home-assistant.io/docs/documenting/standards
14 changes: 9 additions & 5 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ on:

jobs:
lock:
permissions:
issues: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: dessant/[email protected]
- uses: dessant/[email protected]
if: ${{ github.repository_owner == 'home-assistant' }}
with:
github-token: ${{ github.token }}
issue-lock-inactive-days: "30"
issue-exclude-created-before: "2020-10-01T00:00:00Z"
issue-inactive-days: "30"
exclude-issue-created-before: "2020-10-01T00:00:00Z"
issue-lock-reason: ""
pr-lock-inactive-days: "1"
pr-exclude-created-before: "2020-11-01T00:00:00Z"
pr-inactive-days: "1"
exclude-pr-created-before: "2020-11-01T00:00:00Z"
pr-lock-reason: ""
6 changes: 5 additions & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ on:

jobs:
stale:
permissions:
issues: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
- uses: actions/[email protected]
if: ${{ github.repository_owner == 'home-assistant' }}
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 60
Expand Down
68 changes: 10 additions & 58 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out files from GitHub
uses: actions/checkout@v2.3.4
- name: Setting up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.4.0
uses: actions/checkout@v4.1.7
- name: Setting up Node.js
uses: actions/setup-node@v4.0.2
with:
node-version: 12.x
- name: Setup NPM cache
uses: actions/[email protected]
with:
path: ~/.npm
key: npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
npm-
node-version: 20
cache: "npm"
- name: Install dependencies
run: npm install
env:
Expand All @@ -31,57 +25,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out files from GitHub
uses: actions/[email protected]
- name: Setting up Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
with:
node-version: 12.x
- name: Setup NPM cache
uses: actions/[email protected]
uses: actions/[email protected]
- name: Setting up Node.js
uses: actions/[email protected]
with:
path: ~/.npm
key: npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
npm-
node-version: 20
cache: "npm"
- name: Install dependencies
run: npm install
env:
CI: true
- name: Run textlint
run: npm run textlint
build:
name: Jekyll build
runs-on: ubuntu-18.04
needs: [markdown-lint]
steps:
- name: Check out files from GitHub
uses: actions/[email protected]
- name: Setting up Ruby 2.6
uses: ruby/[email protected]
with:
ruby-version: 2.6
- name: Setup Ruby Gems cache
uses: actions/[email protected]
with:
path: vendor/bundle
key: gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
gems-
- name: Installing dependencies
run: |
gem install bundler -v 2.0.1
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Setting up Jekyll cache
uses: actions/[email protected]
with:
path: source/.jekyll-cache
key:
jekyll-${{ hashFiles('**/Gemfile.lock') }}-${{
hashFiles('**/_config.yml') }}
restore-keys: |
jekyll-${{ hashFiles('**/Gemfile.lock') }}-
jekyll-
- name: Building site
run: |
bundle exec rake generate
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.1
18
10 changes: 9 additions & 1 deletion .remarkignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@
_source/developers/credits.markdown

# Third party
sass/inuitcss/*
sass/inuitcss/*
LICENSE.md

# Changelogs are made out of commit messages
# We don't want to correct them
source/changelogs

# Lots of older changelogs we don't want to change/update
source/_posts
50 changes: 35 additions & 15 deletions .remarkrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
var remarkrc = {
settings: {
bullet: '-',
commonmark: true,
emphasis: '_',
fence: '`',
incrementListMarker: true,
listItemIndent: 1,
strong: '*'
},
plugins: [
["frontmatter"],
["lint-fenced-code-flag"],
["lint-no-shell-dollars"]
]
settings: {
bullet: "-",
commonmark: true,
emphasis: "_",
fence: "`",
incrementListMarker: true,
listItemIndent: 1,
strong: "*",
},
plugins: [
["frontmatter"],
["lint-fenced-code-flag"],
["lint-no-shell-dollars"],
["remark-lint-heading-increment"],
["remark-lint-heading-style", "atx"],
["remark-lint-unordered-list-marker-style", "-"],
["remark-lint-ordered-list-marker-style", "."],
["remark-lint-ordered-list-marker-value"],
[
"remark-lint-prohibited-strings",
[
{ no: "[Hh]ome [Aa]ss?s?istant", yes: "Home Assistant" },
{ no: "[Ww]eb[Ss]ocket", yes: "WebSocket" },
{ no: "Github", yes: "GitHub" },
{
no: "https://www.home-assistant.io/",
yes: "/",
ignoreNextTo: ['"', '"'],
},
{ no: "Speech-[Tt]o-Text", yes: "Speech-to-text" },
{ no: "Text-[Tt]o-Speech", yes: "Text-to-speech" },
],
],
],
};

module.exports = remarkrc;
module.exports = remarkrc;
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2
3.1.4
Loading

0 comments on commit e52516f

Please sign in to comment.