From 6e2122d146601581b37cd5e98da73816d0f22a17 Mon Sep 17 00:00:00 2001
From: tdejoigny-ledger <thibault.de-joigny@ledger.fr>
Date: Mon, 29 Jul 2024 18:05:06 +0200
Subject: [PATCH] PR remarks fixes

---
 .../continuous-integration-workflow.yml       | 10 ++++++++
 .../reusable_ragger_tests_latest_speculos.yml | 23 +++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index f5db54f7..2bcc708e 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -140,6 +140,16 @@ jobs:
       test_dir: tests
       speculos_app_branch_name: ${{ github.ref }}
 
+  package_and_test_docker_for_nanos:
+    name: Build and test the Speculos docker for Nano S
+    uses: ./.github/workflows/reusable_ragger_tests_latest_speculos.yml
+    needs: [package_and_test_docker]
+    with:
+      app_repository: LedgerHQ/app-boilerplate
+      app_branch_name: nanos_baseline
+      test_dir: tests
+      speculos_app_branch_name: ${{ github.ref }}
+
   deploy_docker:
     name: Build and Upload the Speculos docker
     runs-on: ubuntu-latest
diff --git a/.github/workflows/reusable_ragger_tests_latest_speculos.yml b/.github/workflows/reusable_ragger_tests_latest_speculos.yml
index 8d236153..db7eaee6 100644
--- a/.github/workflows/reusable_ragger_tests_latest_speculos.yml
+++ b/.github/workflows/reusable_ragger_tests_latest_speculos.yml
@@ -26,7 +26,7 @@ jobs:
     with:
       app_repository: ${{ inputs.app_repository }}
       app_branch_name: ${{ inputs.app_branch_name }}
-      upload_app_binaries_artifact: "compiled_app_binaries"
+      upload_app_binaries_artifact: compiled_app_binaries-${{ inputs.app_repository }}-${{ inputs.app_branch_name }}
 
   build_docker_image:
     name: Build Speculos Docker image
@@ -57,19 +57,22 @@ jobs:
         name: speculos_image
         path: /tmp/speculos_image.tar
 
+  call_get_app_metadata:
+    name: Retrieve application metadata
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/_get_app_metadata.yml@v1
+    with:
+      app_repository: ${{ inputs.app_repository }}
+      app_branch_name: ${{ inputs.app_branch_name }}
+
   ragger_tests:
     name: Functional tests with Ragger
     runs-on: ubuntu-latest
-    needs: [build_docker_image, build_application]
+    needs: [build_docker_image, build_application, call_get_app_metadata]
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - device: nanos
-          - device: nanox
-          - device: nanosp
-          - device: stax
-          - device: flex
+        device: ${{ fromJSON(needs.call_get_app_metadata.outputs.compatible_devices) }}
+
     steps:
     - name: Clone
       uses: actions/checkout@v4
@@ -83,7 +86,7 @@ jobs:
       uses: actions/checkout@v4
       with:
           repository: ${{ inputs.app_repository }}
-          ref: ${{ matrix.device == 'nanos' && 'nanos_baseline' || inputs.app_branch_name  }}
+          ref: ${{ inputs.app_branch_name }}
           path: app
           submodules: recursive
           fetch-depth: 0
@@ -105,7 +108,7 @@ jobs:
     - name: Download app binaries
       uses: actions/download-artifact@v4
       with:
-        name: "compiled_app_binaries"
+        name: compiled_app_binaries-${{ inputs.app_repository }}-${{ inputs.app_branch_name }}
         path: ${{ github.workspace }}/app/build
 
     - name: Run and test Speculos docker