Update after PR review

Author: yogh333

.github/workflows/get_rust_apps.py

@@ -8,13 +8,18 @@
     print("Usage: get_rust_apps.py <github_token>")
     sys.exit(1)
 
-ledger_devices = ["nanos+", "nanox", "stax", "flex"]
-filtered_apps = ["app-kadena-legacy", "app-pocket"]
+# Excluded Rust apps
+# app-kadena-legacy: has been replaced by app-kadena
+# app-pocket: does not build (Obsidians' Alamgu issue)
+excluded_apps = ["app-kadena-legacy", "app-pocket"]
 
-# Retrieve all apps on LedgerHQ GitHub organization
+# Excluded devices
+excluded_devices = ["nanos"]
+
+# Retrieve all public apps on LedgerHQ GitHub organization
 token = sys.argv[1]
 gh = GitHubLedgerHQ(token)
-apps=gh.apps.filter(archived=Condition.WITHOUT)
+apps=gh.apps.filter(private=Condition.WITHOUT, archived=Condition.WITHOUT)
 
 rust_apps = []
 exclude_apps = []
@@ -29,20 +34,11 @@
     else:
         # Filter out apps that are Rust based
         if manifest.app.sdk == "rust":
-                rust_apps.append(app.name)
-                # filter out app for specific devices
-                for d in ledger_devices:
-                    if d not in manifest.app.devices or app.name in filtered_apps:
-                        exclude_apps.append({"app-name": app.name, "device": d})
+            if app.name not in excluded_apps:
+                for d in manifest.app.devices:
+                    if d not in excluded_devices:
+                        rust_apps.append({"app-name": app.name, "device": d})
 
-# save the list of Rust apps in a json format:
+# save the list of (apps, device) pairs to build in a json format:
 with open("rust_apps.json", "w") as f:
-    f.write(json.dumps(rust_apps))
-
-# save the list of Excluded apps in a json format:
-with open("exclude_apps.json", "w") as f:
-    f.write(json.dumps(exclude_apps))
-
-# save the list of Ledger devices in a json format:
-with open("ledger_devices.json", "w") as f:
-    f.write(json.dumps(ledger_devices))
+    f.write(json.dumps(rust_apps))

.github/workflows/reusable_build_all_apps.yml

@@ -26,7 +26,7 @@ jobs:
           run: |
             if [ -n "${{ inputs.c_sdk_branch }}" ]; then
               echo "repo=LedgerHQ/ledger-device-rust-sdk" >> $GITHUB_OUTPUT
-              echo "branch=y333/update_ci" >> $GITHUB_OUTPUT
+              echo "branch=master" >> $GITHUB_OUTPUT
             else
               echo "repo=${{ github.repository}}" >> $GITHUB_OUTPUT
               echo "branch=${{ github.ref }}" >> $GITHUB_OUTPUT
@@ -37,8 +37,6 @@ jobs:
       needs: how-workflow-is-called
       outputs:
         rust_apps: ${{ steps.get_rust_apps.outputs.rust_apps }}
-        exclude_apps: ${{ steps.get_rust_apps.outputs.exclude_apps }}
-        ledger_devices: ${{ steps.get_rust_apps.outputs.ledger_devices }}
       steps:
         - name: Checkout repository
           uses: actions/checkout@v4
@@ -56,8 +54,6 @@ jobs:
           run: |
             python .github/workflows/get_rust_apps.py ${{ secrets.GITHUB_TOKEN }}
             echo "rust_apps=$(cat rust_apps.json)" >> $GITHUB_OUTPUT
-            echo "exclude_apps=$(cat exclude_apps.json)" >> $GITHUB_OUTPUT
-            echo "ledger_devices=$(cat ledger_devices.json)" >> $GITHUB_OUTPUT
 
     display-rust-apps:
       name: Display Rust Apps
@@ -67,18 +63,16 @@ jobs:
         - name: Display Rust Apps
           run: |
             echo "Rust apps: ${{ needs.retrieve-rust-apps.outputs.rust_apps }}"
-            echo "Exclude apps: ${{ needs.retrieve-rust-apps.outputs.exclude_apps }}"
-            echo "Ledger devices: ${{ needs.retrieve-rust-apps.outputs.ledger_devices }}"
 
     test-build:
         name: Build for all targets
         needs: [retrieve-rust-apps, how-workflow-is-called]
         strategy:
             fail-fast: false
             matrix:
-              app-name: ${{ fromJSON(needs.retrieve-rust-apps.outputs.rust_apps) }}
-              device: ${{ fromJSON(needs.retrieve-rust-apps.outputs.ledger_devices) }}
-              exclude: ${{ fromJSON(needs.retrieve-rust-apps.outputs.exclude_apps) }}
+              app-name: ["app-boilerplate-rust"]
+              device: ["nanos+", "nanox", "stax", "flex"]
+              include: ${{ fromJSON(needs.retrieve-rust-apps.outputs.rust_apps) }}
         runs-on: ubuntu-latest
         container:
             image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest