Merge pull request #138 from LedgerHQ/cev/port_apex

Adding Flex support

Author: cedelavergne-ledger

.github/workflows/_get_app_metadata.yml

@@ -23,7 +23,7 @@ on:
 
           Defaults to the full list of device(s) supported by the application as configured in the
           'ledger_app.toml' manifest.
-          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex"]).
+          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex", "apex_m", "apex_p"]).
         required: false
         default: 'None'
         type: string

.github/workflows/end_to_end_tests_of_reusable_workflows.yml

@@ -92,6 +92,9 @@ jobs:
           - name: boilerplate
             repo: 'LedgerHQ/app-boilerplate'
             branch: 'master'
+          - name: kaspa
+            repo: 'LedgerHQ/app-kaspa'
+            branch: 'develop'
 
     uses: ./.github/workflows/reusable_build.yml
     with:

.github/workflows/reusable_build.yml

@@ -43,7 +43,7 @@ on:
 
           Defaults to the full list of device(s) supported by the application as configured in the
           'ledger_app.toml' manifest.
-          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex"]).
+          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex", "apex_m", "apex_p"]).
         required: false
         default: 'None'
         type: string
@@ -85,7 +85,7 @@ jobs:
       token: ${{ secrets.token }}
 
   build:
-    name: Build application for NanoS, X, S+, and Stax
+    name: Build application for all selected devices
     needs: call_get_app_metadata
     strategy:
       fail-fast: false

.github/workflows/reusable_guidelines_enforcer.yml

@@ -14,7 +14,7 @@ on:
 
           Defaults to the full list of device(s) supported by the application as configured in the
           'ledger_app.toml' manifest.
-          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex"]).
+          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex", "apex_m", "apex_p"]).
         required: false
         default: 'None'
         type: string

.github/workflows/reusable_ragger_tests.yml

@@ -55,7 +55,7 @@ on:
 
           Defaults to the full list of device(s) supported by the application as configured in the
           'ledger_app.toml' manifest.
-          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex"]).
+          If the manifest is missing, defaults to ALL (["nanos", "nanox", "nanosp", "stax", "flex", "apex_m", "apex_p"]).
         required: false
         default: 'None'
         type: string

scripts/cargo_metadata_dump.py

@@ -32,7 +32,7 @@ def save_app_params(device: str, app_build_path: Path, json_path: Path) -> None:
         app_flags = int(app_flags, 16)
     else:
         app_flags = int(app_flags)
-    if device in ["nanox", "stax", "flex"]:
+    if device in ["nanox", "stax", "flex", "apex_m", "apex_p"]:
         app_flags = app_flags | 0x200
     app_flags = "0x{:03x}".format(app_flags)
 
@@ -67,7 +67,7 @@ def save_app_params(device: str, app_build_path: Path, json_path: Path) -> None:
     parser.add_argument("--device",
                         help="device model",
                         required=True,
-                        choices=["nanos", "nanox", "nanosp", "stax", "flex"])
+                        choices=["nanos", "nanox", "nanosp", "stax", "flex", "apex_m", "apex_p"])
     parser.add_argument("--app_build_path",
                         help="App build path, e.g. <app-boilerplate/app>",
                         required=True)

scripts/check_icons.sh

@@ -5,25 +5,23 @@ set -e
 # shellcheck source=scripts/logger.sh
 source "$(dirname "$0")/logger.sh"
 
+
 check_geometry() (
     error=0
     file="$1"
     device="$2"
 
     case "$device" in
-        "nanos")
+        nanos)
             geometry="16x16"
             ;;
-        "nanox")
-            geometry="14x14"
-            ;;
-        "nanos2")
+        nanox | nanos2)
             geometry="14x14"
             ;;
-        "stax")
+        stax | apex | apex_m | apex_p)
             geometry="32x32"
             ;;
-        "flex")
+        flex)
             geometry="40x40"
             ;;
         *)
@@ -202,14 +200,26 @@ main() (
     for icon_and_device in "${!icons_and_devices[@]}"; do
         icon="$(echo "$icon_and_device" | cut -d';' -f1)"
         device="$(echo "$icon_and_device" | cut -d';' -f2)"
-        check_icon "$repo_name" "$device" "$repo/$build_directory/$icon" || error=1
+        img_file="$repo/$build_directory/$icon"
+        if ! [[ -f "$img_file" ]]; then
+            log_error "Icon file '$img_file' Doesn't exist!"
+            error=1
+            continue
+        fi
+        check_icon "$repo_name" "$device" "$img_file" || error=1
     done
 
     # As we scanned for all devices and all variants, we can have a lot of duplicates for glyphs. Filter out duplicates and empty lines
     all_glyph_files_no_duplicates="$(echo "$all_glyph_files" | tr ' ' '\n' | sort -u | grep .)"
     while IFS= read -r file; do
         # Skip SDK glyphs
         if [[ "$file" != "/opt/"*"-secure-sdk/"* ]]; then
+            img_file="$repo/$build_directory/$file"
+            if ! [[ -f "$img_file" ]]; then
+                log_error "Glyph file '$img_file' Doesn't exist!"
+                error=1
+                continue
+            fi
             check_glyph "$repo/$build_directory/$file" || error=1
         fi
     done < <(echo "$all_glyph_files_no_duplicates")