Merge pull request #28 from LedgerHQ/glyphs_include_new_path

Glyphs include new path
LedgerHQ · Feb 3, 2023 · eefb7e1 · eefb7e1
2 parents 7562eb5 + 9b86e72
commit eefb7e1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -8,17 +8,16 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Build with Clang Static Analyzer
         run: |
-          make clean
           scan-build --use-cc=clang -analyze-headers -enable-checker security -enable-checker unix -enable-checker valist -o scan-build --status-bugs make default
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: scan-build
@@ -29,32 +28,33 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build Nano S app
         run: |
           make DEBUG=1
 
       - name: Upload app binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: app-debug-nanos
           path: bin
 
       - name: Cleanup the repository
         run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git clean -dxf
 
       - name: Build Nano X app
         run: |
           make DEBUG=1 BOLOS_SDK=$NANOX_SDK
 
       - name: Upload app binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: app-debug-nanox
           path: bin
@@ -64,16 +64,15 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
-          apt-get update -q
-          apt-get install -qy libssl-dev
+          apk add openssl3-dev
 
       - name: Build unit tests
         run: |
@@ -94,7 +93,7 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
@@ -103,13 +102,13 @@ jobs:
           apt-get install -qy netcat
 
       - name: Download Nano S app binary
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: app-debug-nanos
           path: bin-nanos
 
       - name: Download Nano X app binary
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: app-debug-nanox
           path: bin-nanox
@@ -128,7 +127,7 @@ jobs:
           pytest tests/
 
       - name: Upload speculos log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: speculos-nanos-log
@@ -152,7 +151,7 @@ jobs:
           pytest tests/
 
       - name: Upload speculos log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: speculos-nanox-log

diff --git a/.github/workflows/lint-workflow.yml b/.github/workflows/lint-workflow.yml
@@ -9,11 +9,11 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint
-        uses: DoozyX/clang-format-lint-action@v0.11
+        uses: DoozyX/clang-format-lint-action@v0.15
         with:
           source: './src'
           extensions: 'h,c'
-          clangFormatVersion: 11
+          clangFormatVersion: 12.0.1
diff --git a/src/ui/main/idle_menu.c b/src/ui/main/idle_menu.c
@@ -17,7 +17,7 @@
 
 #include <os_io_seproxyhal.h>
 #include "idle_menu.h"
-#include "../../glyphs.h"
+#include "glyphs.h"
 #include <ux.h>
 
 // clang-format off

diff --git a/src/xrp/amount.c b/src/xrp/amount.c
@@ -188,8 +188,8 @@ static void format_non_standard_currency(xrp_currency_t *currency, field_value_t
 }
 
 static int format_issued_currency(uint64_t value, char *buf, size_t size) {
-    uint8_t sign = (uint8_t)((value >> 62u) & 0x01u);
-    int16_t exponent = (int16_t)(((value >> 54u) & 0xFFu) - 97);
+    uint8_t sign = (uint8_t) ((value >> 62u) & 0x01u);
+    int16_t exponent = (int16_t) (((value >> 54u) & 0xFFu) - 97);
     uint64_t mantissa = value & 0x3FFFFFFFFFFFFFu;
     size_t len = strlen(buf);
     char *p;