Merge branch 'master' into energy_monitoring

kylegordon · Jun 17, 2024 · 9cd985e · 9cd985e
2 parents 58a3323 + 7a546aa
commit 9cd985e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/esphome-parallel.yaml b/.github/workflows/esphome-parallel.yaml
@@ -100,6 +100,7 @@ jobs:
           cp -R esphome/travis_secrets.yaml.txt esphome/secrets.yaml
       - name: Compile all ESPHome ${{matrix.file}}
         uses: esphome/build-action@v2
+        continue-on-error: true
         with:
           version: dev
           yaml_file: ${{matrix.file}}
@@ -108,7 +109,7 @@ jobs:
   final:
     name: Final ESPHome check
     runs-on: ubuntu-latest
-    needs: [loop-stable, loop-beta, loop-dev]
+    needs: [loop-stable, loop-beta]
     steps:
       - name: Getting your configuration from GitHub
         uses: actions/checkout@v4
diff --git a/esphome/common/common.yaml b/esphome/common/common.yaml
@@ -1,7 +1,6 @@
 api:
 
 ota:
-  platform: esphome
 
 wifi:
   ssid: !secret wifi_ssid