From b922015334e8903a82b85bb14e7c6d897f503586 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 3 Jan 2023 19:42:03 +0100
Subject: [PATCH] Iterate on new CI job (#1569)

---
 .github/workflows/main.yml | 16 ++++++++++------
 apps.json                  |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2b08ed71..d9080062 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,21 +9,25 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Check apps.json
+
+    - name: Check JSON validity for apps.json
       run: |
-        jq apps.json
+        cat apps.json | jq >/dev/null
+
     - name: Check all working apps have consistent app id / app url
       run: |
+        FAULTY_APPS="false";
         for LINE in $(cat apps.json | jq -r 'to_entries[] | select ( .value.state=="working" ) | "\(.key)|\(.value.url)"')
         do
             APP=$(echo $LINE | awk -F'|' '{print $1}')
             URL_END=$(echo $LINE | awk -F'/' '{print $NF}')
-            [ "$APP" == "$(echo $APP | tr [A-Z] [a-z])" ] || echo "$APP : app id should be lowercase" >&2
-            [ "$URL_END" == "${APP}_ynh" ] || echo "$APP : the url should end with ${APP}_ynh" >&2
+            [ "$APP" == "$(echo $APP | tr [A-Z] [a-z])" ] || { FAULTY_APPS="true"; echo "$APP : app id should be lowercase" >&2; }
+            [ "$URL_END" == "${APP}_ynh" ] || { FAULTY_APPS="true"; echo "$APP : the url should end with ${APP}_ynh" >&2; }
         done
+        [ $FAULTY_APPS = "false" ]
 
     - name: Check all working apps have a category
       run: |
-        jq -e -r '.[] | select ( .state=="working" ) | select ( has("category") | not )'  apps.json
-        [ $? -eq 4 ] || echo "Some working applications don't have their category defined ?" >&2
+        APPS_WITH_NO_CATEGORY=$(jq -e -r '.[] | select ( .state=="working" ) | select ( has("category") | not )'  apps.json || true)
+        [ "$APPS_WITH_NO_CATEGORY" == "" ] || { echo "Some working apps are missing a category: $APPS_WITH_NO_CATEGORY" >&2; false; }
 
diff --git a/apps.json b/apps.json
index 24f92345..22b4a725 100644
--- a/apps.json
+++ b/apps.json
@@ -861,7 +861,7 @@
         ],
         "url": "https://github.com/Jojo144/django_app_ynh"
     },
-    "django_example_ynh": {
+    "django_example": {
         "category": "dev",
         "level": 7,
         "state": "working",
@@ -4999,4 +4999,4 @@
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/zwave-js-ui_ynh"
     }
-}
\ No newline at end of file
+}