From dac702ad0b1332cc549aeb0c620f72cb4c4a4a1b Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 18 Feb 2024 17:55:41 +0100
Subject: [PATCH] CI: Improve layout and store description checks (#565)

* CI: Run 'check_layout.py'

Ensures that 'check_layout.output' is not outdated.
Also, update it.

* CI: Check new store descriptions

When a store description is added, 'python3 sync_translations.py' leaves
an untracked file that is not checked.

This makes sure that untracked store descriptions are noticed in CI.
---
 .github/workflows/check-layouts.yml       | 17 ++++++++++++-----
 .github/workflows/check-translations.yml  |  4 ++--
 check_layout.output                       |  5 ++---
 metadata/android/uk/full_description.txt  |  6 ++++++
 metadata/android/uk/short_description.txt |  1 +
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 metadata/android/uk/full_description.txt
 create mode 100644 metadata/android/uk/short_description.txt

diff --git a/.github/workflows/check-layouts.yml b/.github/workflows/check-layouts.yml
index d37af40..49d85a2 100644
--- a/.github/workflows/check-layouts.yml
+++ b/.github/workflows/check-layouts.yml
@@ -1,19 +1,26 @@
 name: Check layouts
 
-# Runs 'gen_layouts.py' and checks that the generated file were uptodate.
-# This doesn't run 'check_layout.py'.
-
 on:
   workflow_dispatch:
   push:
   pull_request:
 
 jobs:
-  check-layouts:
+  gen-layouts:
+    name: Generated files
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4
     - run: python3 gen_layouts.py
-    - name: Check that the generated layouts.xml is uptodate, run python3 gen_layouts.py otherwise
+    - name: "Check that the generated 'layouts.xml' is uptodate, otherwise run 'python3 gen_layouts.py'"
+      run: git diff --exit-code
+  check-layouts:
+    name: check_layout.output
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+    - run: python3 check_layout.py
+    - name: "Check that the generated 'check_layout.output' is uptodate, otherwise run 'python3 check_layout.py'"
       run: git diff --exit-code
diff --git a/.github/workflows/check-translations.yml b/.github/workflows/check-translations.yml
index c06ca23..db30a29 100644
--- a/.github/workflows/check-translations.yml
+++ b/.github/workflows/check-translations.yml
@@ -12,5 +12,5 @@ jobs:
     - name: Checkout repo
       uses: actions/checkout@v4
     - run: python3 sync_translations.py
-    - name: Check that strings files are uptodate, run python3 sync_translations.py otherwise
-      run: git diff --exit-code
+    - name: "Check that strings files are uptodate, otherwise run 'python3 sync_translations.py'"
+      run: git add -N . && git diff --exit-code
diff --git a/check_layout.output b/check_layout.output
index 23004c5..a506f7a 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -65,7 +65,7 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
 1 warnings
 # latn_bone
 Layout includes some ASCII punctuation but not all, missing: $
-Layout redefines the bottom row but some important keys are missing, missing: compose, cursor_left, cursor_right, loc end, loc home, loc page_down, loc page_up, loc switch_greekmath, loc voice_typing, switch_backward
+Layout redefines the bottom row but some important keys are missing, missing: cursor_left, cursor_right, loc compose, loc end, loc home, loc page_down, loc page_up, loc switch_greekmath, loc voice_typing, switch_backward
 2 warnings
 # latn_colemak
 Some keys contain whitespaces, unexpected:  ́
@@ -73,8 +73,7 @@ Some keys contain whitespaces, unexpected:  ́
 # latn_dvorak
 0 warnings
 # latn_neo2
-Layout redefines the bottom row but some important keys are missing, missing: compose, loc end, loc home, loc page_down, loc page_up
-1 warnings
+0 warnings
 # latn_qwerty_br
 0 warnings
 # latn_qwerty_cz
diff --git a/metadata/android/uk/full_description.txt b/metadata/android/uk/full_description.txt
new file mode 100644
index 0000000..f6e65f3
--- /dev/null
+++ b/metadata/android/uk/full_description.txt
@@ -0,0 +1,6 @@
+Головна особливість полягає в тому, що ви можете вводити більше символів, проводячи клавіші до кутів.
+
+Ця програма спочатку була розроблена для програмістів, які використовують Termux.
+Тепер ідеально підходить для щоденного використання.
+
+Ця програма не містить реклами, не надсилає жодних мережевих запитів і має відкритий код.
diff --git a/metadata/android/uk/short_description.txt b/metadata/android/uk/short_description.txt
new file mode 100644
index 0000000..64c80a2
--- /dev/null
+++ b/metadata/android/uk/short_description.txt
@@ -0,0 +1 @@
+Легка та конфіденційна віртуальна клавіатура для Android.