Merge branch 'current' into patch-93

Author: Hedda

Dockerfile renamed to .devcontainer/Dockerfile

@@ -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 \
@@ -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`

.devcontainer/devcontainer.json

@@ -1,24 +1,27 @@
 {
   "name": "home-assistant.io",
   "build": {
-    "dockerfile": "../Dockerfile",
+    "dockerfile": "./Dockerfile",
     "context": "..",
     "args": {
-      "VARIANT": "2.7",
-      "NODE_VERSION": "18"
+      "VARIANT": "3.1",
+      "NODE_VERSION": "20"
     }
   },
   "appPort": [4000],
   "onCreateCommand": "bundle install && npm install",
-  "containerEnv": { "DEVCONTAINER": "true" },
+  "containerEnv": { 
+    "DEVCONTAINER": "true",
+    "BUNDLE_PATH": "vendor/bundle"
+  },
   "customizations": {
     "vscode": {
       "extensions": [
         "davidanson.vscode-markdownlint",
         "editorconfig.editorconfig",
         "GitHub.vscode-pull-request-github",
         "mrmlnc.vscode-scss",
-        "rebornix.Ruby",
+        "Shopify.ruby-lsp",
         "streetsidesoftware.code-spell-checker",
         "taichi.vscode-textlint",
         "yzhang.markdown-all-in-one"
@@ -29,7 +32,8 @@
         "gitlens.showWelcomeOnInstall": false,
         "gitlens.showWhatsNewAfterUpgrades": false,
         "terminal.integrated.shell.linux": "/usr/bin/zsh",
-        "workbench.startupEditor": "none"
+        "workbench.startupEditor": "none",
+        "rubyLsp.rubyVersionManager": "none"
       }
     }
   }

.github/PULL_REQUEST_TEMPLATE.md

@@ -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.
 

.github/workflows/add_prs_to_project.yml

@@ -18,7 +18,7 @@ jobs:
           app_id: ${{ secrets.PROJECTS_APP_ID }}
           private_key: ${{ secrets.PROJECTS_APP_PEM }}
       - name: Add to Project
-        uses: actions/add-to-project@v0.5.0
+        uses: actions/add-to-project@v0.6.0
         with:
           project-url: https://github.com/orgs/home-assistant/projects/10
           github-token: ${{ steps.token.outputs.token }}

.github/workflows/stale.yml

@@ -11,7 +11,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8.0.0
+      - uses: actions/stale@v9.0.0
         if: ${{ github.repository_owner == 'home-assistant' }}
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -10,9 +10,9 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/[email protected]
       - name: Setting up Node.js
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
-          node-version: 16.x
+          node-version: 20
           cache: "npm"
       - name: Install dependencies
         run: npm install
@@ -27,9 +27,9 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/[email protected]
       - name: Setting up Node.js
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
-          node-version: 16.x
+          node-version: 20
           cache: "npm"
       - name: Install dependencies
         run: npm install

.ruby-version

@@ -1 +1 @@
-2.7.2
+3.1.4

.textlintrc.json

@@ -150,7 +150,6 @@
         "iTunes",
         "JSON-RPC",
         "JSON",
-        "JuiceNet",
         "Kafka",
         "KEF",
         "KNX",

.vscode/cSpell.json

@@ -34,6 +34,7 @@
     "Fitbit",
     "Flexit",
     "Frenck",
+    "geofence",
     "geolocation",
     "GPSLogger",
     "Harman",

.vscode/extensions.json

@@ -4,7 +4,7 @@
         "editorconfig.editorconfig",
         "GitHub.vscode-pull-request-github",
         "mrmlnc.vscode-scss",
-        "rebornix.Ruby",
+        "Shopify.ruby-lsp",
         "streetsidesoftware.code-spell-checker",
         "taichi.vscode-textlint",
         "yzhang.markdown-all-in-one"