Merge branch 'master' into sca075

sca075 · Jun 8, 2024 · 826da21 · 826da21
2 parents a635aa4 + a7dfaab
commit 826da21
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 7 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,6 +22,31 @@ jobs:
       - name: Validate
         run: jq --raw-output . appdaemon blacklist critical integration netdaemon plugin python_script removed template theme
 
+  jsonschema:
+    name: JSON schema
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4.1.1
+
+      - name: Critical
+        uses: cardinalby/schema-validator-action@3.1.1
+        with:
+          file: "critical"
+          schema: "tools/jsonschema/critical.schema.json"
+
+      - name: Repositories
+        uses: cardinalby/schema-validator-action@3.1.1
+        with:
+          file: "appdaemon|blacklist|integration|netdaemon|plugin|python_script|template|theme"
+          schema: "tools/jsonschema/repositories.schema.json"
+
+      - name: Removed
+        uses: cardinalby/schema-validator-action@3.1.1
+        with:
+          file: "removed"
+          schema: "tools/jsonschema/removed.schema.json"
+
   sorted:
     name: Sorted
     runs-on: ubuntu-latest
@@ -30,4 +55,4 @@ jobs:
         uses: actions/checkout@v4.1.1
 
       - name: Check lists
-        run: python3 scripts/is_sorted.py
+        run: python3 scripts/is_sorted.py
diff --git a/.github/workflows/upload-critical.yml b/.github/workflows/upload-critical.yml
@@ -20,6 +20,12 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4.1.1
 
+      - name: Validate with JSON schema
+        uses: cardinalby/schema-validator-action@3.1.1
+        with:
+          file: 'critical'
+          schema: 'tools/jsonschema/critical.schema.json'
+
       - name: Set up Python
         uses: actions/setup-python@v5.0.0
         id: python

diff --git a/.github/workflows/upload-removed.yml b/.github/workflows/upload-removed.yml
@@ -20,6 +20,12 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4.1.1
 
+      - name: Validate with JSON schema
+        uses: cardinalby/schema-validator-action@3.1.1
+        with:
+          file: 'removed'
+          schema: 'tools/jsonschema/removed.schema.json'
+
       - name: Set up Python
         uses: actions/setup-python@v5.0.0
         id: python

diff --git a/blacklist b/blacklist
@@ -120,6 +120,7 @@
   "DavidMStraub/homeassistant-homeconnect",
   "DCSBL/ha-homewizard-energy",
   "DeebotUniverse/Deebot-4-Home-Assistant",
+  "dgomes/ha_rrd_recorder",
   "digitaljamie/google-theme",
   "disforw/inverse",
   "djtimca/hagooglewifi",
@@ -213,18 +214,23 @@
   "ntilley905/faastatus",
   "OpenXbox/xboxone-home-assistant",
   "opravdin/weback-hass",
+  "oziee/ha-solcast-solar",
+  "patrickhilker/tedee_hass_integration",
   "perara/systemair-save-connect",
   "peternijssen/home-assistant-jumbo",
   "peternijssen/lovelace-postnl-card",
   "Petro31/ad_multizone_media_control",
   "Petro31/ad_people_tracker",
+  "pfunkmallone/HACS-camect-custom_card",
+  "pfunkmallone/HACS-camect-integration",
   "pilotak/homeassistant-mikrotik",
   "PiotrMachowski/Home-Assistant-custom-components-Google-Keep",
   "pippyn/Home-Assistant-Sensor-Groningen-Afvalwijzer",
   "pippyn/Home-Assistant-Sensor-Ophaalkalender",
   "ppanagiotis/pymusiccast",
   "PTST/O365-HomeAssistant",
   "PTST/O365Calendar-HomeAssistant",
+  "Racailloux/home-assistant-pijuice",
   "Raukze/home-assistant-fitx",
   "rccoleman/lamarzocco",
   "reharmsen/hass-youless-component",

diff --git a/integration b/integration
@@ -258,7 +258,6 @@
   "dext0r/yandex_smart_home",
   "dgomes/ha_erse",
   "dgomes/ha_generic_water_heater",
-  "dgomes/ha_rrd_recorder",
   "dimagoltsman/ha-proof-dashcam-integration",
   "dingo35/ha-SmartEVSEv3",
   "djansen1987/SAJeSolar",
@@ -699,13 +698,11 @@
   "osk2/panasonic_smart_app",
   "osohotwateriot/osoenergy_community",
   "oven-lab/tuya_cloud_map_extractor",
-  "oziee/ha-solcast-solar",
   "pail23/stiebel_eltron_isg_component",
   "pantherale0/ha-nintendoparentalcontrols",
   "parautenbach/hass-shairport-sync",
   "Patrick762/hassio-bluetti-bt",
   "Patrick762/hassio-streamdeck",
-  "patrickhilker/tedee_hass_integration",
   "patrickribbing/sjofartsverket_viva-component",
   "Paul-dH/Home-Assisant-Sensor-OvApi",
   "PaulAnnekov/home-assistant-padavan-tracker",
@@ -722,7 +719,6 @@
   "petergridge/openweathermaphistory",
   "petretiandrea/home-assistant-tapo-p100",
   "Petro31/ha-integration-multizone-controller",
-  "pfunkmallone/HACS-camect-integration",
   "Pigotka/ha-cc-jablotron-cloud",
   "piitaya/home-assistant-qubino-wire-pilot",
   "pilotak/homeassistant-attributes",
@@ -764,7 +760,6 @@
   "pyalarmdotcom/alarmdotcom",
   "Pyhass/Hive-Custom-Component",
   "r-renato/ha-climacell-weather",
-  "Racailloux/home-assistant-pijuice",
   "radical-squared/aquatemp",
   "Rain1971/V2C_trydant",
   "raman325/ha-zoom-automation",

diff --git a/plugin b/plugin
@@ -232,7 +232,6 @@
   "ownbee/bootstrap-grid-card",
   "peetereczek/ztm-stop-card",
   "petergridge/Irrigation-Card",
-  "pfunkmallone/HACS-camect-custom_card",
   "pgorod/power-todoist-card",
   "phischdev/lovelace-mushroom-better-sliders",
   "piitaya/lovelace-climate-mode-entity-row",

diff --git a/removed b/removed
@@ -1581,5 +1581,41 @@
     "reason": "Repository is archived",
     "removal_type": "remove",
     "link": "https://github.com/hacs/default/pull/2495"
+  },
+  {
+    "repository": "pfunkmallone/HACS-camect-integration",
+    "reason": "Repository is archived",
+    "removal_type": "remove",
+    "link": "https://github.com/hacs/default/pull/2536"
+  },
+  {
+    "repository": "patrickhilker/tedee_hass_integration",
+    "reason": "Repository is archived",
+    "removal_type": "remove",
+    "link": "https://github.com/hacs/default/pull/2536"
+  },
+  {
+    "repository": "pfunkmallone/HACS-camect-custom_card",
+    "reason": "Repository is archived",
+    "removal_type": "remove",
+    "link": "https://github.com/hacs/default/pull/2536"
+  },
+  {
+    "repository": "dgomes/ha_rrd_recorder",
+    "reason": "Repository is archived",
+    "removal_type": "remove",
+    "link": "https://github.com/hacs/default/pull/2536"
+  },
+  {
+    "repository": "oziee/ha-solcast-solar",
+    "reason": "Repository no longer exsist",
+    "removal_type": "remove",
+    "link": "https://github.com/hacs/integration/issues/3745"
+  },
+  {
+    "repository": "Racailloux/home-assistant-pijuice",
+    "reason": "Repository no longer exsist",
+    "removal_type": "remove",
+    "link": "https://github.com/hacs/default/pull/2537"
   }
 ]
diff --git a/tools/jsonschema/critical.schema.json b/tools/jsonschema/critical.schema.json
@@ -0,0 +1,26 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Schema for critical repositories",
+    "type": "array",
+    "items": {
+        "type": "object",
+        "properties": {
+            "repository": {
+                "type": "string",
+                "pattern": "^[\\w\\.-]+\/[\\w\\.-]+$"
+            },
+            "reason": {
+                "type": "string"
+            },
+            "link": {
+                "type": "string",
+                "format": "uri"
+            }
+        },
+        "required": [
+            "repository",
+            "reason",
+            "link"
+        ]
+    }
+}
diff --git a/tools/jsonschema/removed.schema.json b/tools/jsonschema/removed.schema.json
@@ -0,0 +1,27 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Schema for removed repositories",
+    "type": "array",
+    "items": {
+        "type": "object",
+        "properties": {
+            "link": {
+                "type": "string"
+            },
+            "reason": {
+                "type": "string"
+            },
+            "removal_type": {
+                "type": "string"
+            },
+            "repository": {
+                "type": "string",
+                "pattern": "^[\\w\\.-]+\/[\\w\\.-]+$"
+            }
+        },
+        "required": [
+            "removal_type",
+            "repository"
+        ]
+    }
+}
diff --git a/tools/jsonschema/repositories.schema.json b/tools/jsonschema/repositories.schema.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Shema for a repository list",
+    "type": "array",
+    "items": {
+        "type": "string",
+        "pattern": "^[\\w\\.-]+\/[\\w\\.-]+$"
+    }
+}