Make link-wrap.sh Linux and macOS cross-platform compatible

ledger_secure_sdk_sys/.cargo/config.toml → .cargo/config.toml

@@ -1,6 +1,6 @@
 [unstable]
-build-std = ["core"]
+build-std = ["core", "alloc"]
 build-std-features = ["compiler-builtins-mem"]
 
 [build]
-target = "nanosplus"
+target = "flex"

.github/workflows/build_with_current_nightly.yml

@@ -32,7 +32,6 @@ jobs:
           BUILD_DEVICE_NAME="$(echo ${{ matrix.device }})"
           BIN_DIR_NAME="$(echo ${{ matrix.device }} | sed 's/nanosplus/nanos2/')"
           cd app-boilerplate
-          RUST_NIGHTLY=nightly
           cargo ledger build ${{ matrix.device }}
 
       #- name: Upload binary artifacts

.github/workflows/ci.yml

@@ -21,31 +21,15 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
     strategy:
       matrix:
-        target: ["nanos", "nanox", "nanosplus", "stax", "flex"]
+        target: ["nanox", "nanosplus", "stax", "flex"]
         package: [include_gif, testmacro, ledger_secure_sdk_sys, ledger_device_sdk]
     steps:
-      - name: Print Environment variables
-        run:
-          echo "The value of RUST_NIGHTLY is $RUST_NIGHTLY"
       - name: Clone
         uses: actions/checkout@v4
       - name: Cargo clippy
         working-directory: ${{ matrix.package }}
         run: |
-          cargo +$RUST_NIGHTLY clippy --target ${{ matrix.target }}
-
-  clippy-cargo-ledger:
-    name: Run static analysis for cargo-ledger
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-      - name: Cargo clippy for cargo-ledger
-        working-directory: cargo-ledger
-        run: |
-          cargo +$RUST_STABLE clippy --no-deps
+          cargo clippy --target ${{ matrix.target }}
 
   format:
     name: Check code formatting
@@ -57,7 +41,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Run cargo fmt
         run: |
-          cargo +$RUST_NIGHTLY fmt --all --check
+          cargo fmt --all --check
 
   build:
     name: Build SDK
@@ -66,27 +50,14 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
     strategy:
       matrix:
-        target: ["nanos", "nanox", "nanosplus", "stax", "flex"]
+        target: ["nanox", "nanosplus", "stax", "flex"]
     steps:
       - name: Clone
         uses: actions/checkout@v4
       - name: Cargo build
         working-directory: ledger_device_sdk
         run: |
-          cargo +$RUST_NIGHTLY build --target ${{ matrix.target }}
-
-  build-cargo-ledger:
-    name: Build SDK
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-      - name: Cargo build
-        working-directory: cargo-ledger
-        run: |
-          cargo +$RUST_STABLE build
+          cargo build --target ${{ matrix.target }}
 
   test:
     name: Run unit and integration tests
@@ -95,11 +66,11 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
     strategy:
       matrix:
-        target: ["nanos", "nanox", "nanosplus", "stax", "flex"]
+        target: ["nanox", "nanosplus", "stax", "flex"]
     steps:
       - name: Clone
         uses: actions/checkout@v4
       - name: Unit tests
         working-directory: ledger_device_sdk
         run: |
-          cargo +$RUST_NIGHTLY test --target ${{ matrix.target }} --features speculos --tests
+          cargo test --target ${{ matrix.target }} --features speculos --tests

.github/workflows/get_rust_apps.py

@@ -0,0 +1,41 @@
+from ledgered.github import GitHubLedgerHQ, NoManifestException, Condition
+from github.GithubException import GithubException
+
+import sys
+import json
+
+if len(sys.argv) != 2:
+    print("Usage: get_rust_apps.py <github_token>")
+    sys.exit(1)
+
+# Excluded Rust apps
+# app-kadena-legacy: has been replaced by app-kadena
+# app-pocket: does not build (Obsidians' Alamgu issue)
+# app-age: not maintained anymore
+excluded_apps = ["app-kadena-legacy", "app-pocket", "app-age"]
+
+# Retrieve all public apps on LedgerHQ GitHub organization
+token = sys.argv[1]
+gh = GitHubLedgerHQ(token)
+apps=gh.apps.filter(private=Condition.WITHOUT, archived=Condition.WITHOUT)
+
+rust_apps = []
+exclude_apps = []
+# loop all apps in gh.apps
+for app in apps:
+    try: 
+        manifest = app.manifest    
+    except NoManifestException as e:
+        pass
+    except GithubException as e:
+        pass
+    else:
+        # Filter out apps that are Rust based
+        if manifest.app.sdk == "rust":
+            if app.name not in excluded_apps:
+                for d in manifest.app.devices:
+                    rust_apps.append({"app-name": app.name, "device": d})
+
+# 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))

.github/workflows/publish.yml

@@ -2,12 +2,12 @@ name: Publish to Crates.io
 
 on:
   push:
-    tags:
-      - '*@*.*.*'  # Match tags like 'package1@1.2.3'
+    branches:
+      - master
   workflow_dispatch:  # Allow manual workflow dispatch
 
 jobs:
-  test-dry-run:
+  dry-run-publish:
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch'  # Only run this job for manual triggers
 
@@ -21,33 +21,31 @@ jobs:
           profile: minimal
           toolchain: stable
 
-      - name: Retrieve Package Names from workspace root
-        id: get-root-packages
-        run: |
-          # Retrieve package names from the workspace root
-          PACKAGE_NAMES=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[].name' | tr '\n' ' ')
-
-          # Set the package names as an output
-          echo "Package names from root Cargo.toml: $PACKAGE_NAMES"
-          echo "::set-output name=package-names::$PACKAGE_NAMES"
-        shell: bash
-        working-directory: ${{ github.workspace }}
-
       - name: Test Dry-Run Publish for Each Package
         run: |
           # Iterate through package names retrieved
-          PACKAGE_NAMES="${{ steps.get-root-packages.outputs.package-names }}"
+          PACKAGE_NAMES="testmacro include_gif ledger_secure_sdk_sys ledger_device_sdk"
           for PACKAGE_NAME in $PACKAGE_NAMES; do
-            # Test a dry-run publish for each package within the workspace
-            cargo publish --dry-run --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --package "$PACKAGE_NAME"
+            # Test a dry-run publish for each package within the workspace if required
+            last_published_version=$(cargo search -q --limit 1 $PACKAGE_NAME | grep -oP '\d+\.\d+\.\d+')
+            echo "Published version of $PACKAGE_NAME is $version_published"
+            manifest_version=$(cargo metadata --format-version=1 --no-deps | jq -r --arg PACKAGE_NAME "$PACKAGE_NAME" '.packages[] | select(.name == $PACKAGE_NAME) | .version')
+            echo "Current version in manifest for $PACKAGE_NAME is $manifest_version"
+            if [ "$last_published_version" == "$manifest_version" ]; then
+              echo "Package $PACKAGE_NAME is already published with version $manifest_version."
+            else
+              echo "Package $PACKAGE_NAME is not published with version $manifest_version."
+              echo "Dry-run publishing $PACKAGE_NAME..."
+              cargo publish --dry-run --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --package "$PACKAGE_NAME"
+            fi
           done
         env:
           CARGO_TERM_COLOR: always
         working-directory: ${{ github.workspace }}
 
-  build-and-publish:
+  crates-io-publish:
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'  # Only run this job for tag pushes
+    if: github.event_name == 'push'  # Only run this job for pushes
 
     steps:
       - name: Checkout Code
@@ -58,48 +56,25 @@ jobs:
         with:
           profile: minimal
           toolchain: stable
-
-      - name: Determine Package to Publish
-        id: determine-package
-        run: |
-          # Extract package name from the tag name
-          TAG_NAME="${{ github.ref }}"
-          PACKAGE_NAME=$(echo "$TAG_NAME" | cut -d'/' -f3 | cut -d'@' -f1)
-
-          PACKAGE_NAMES=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[].name' | tr '\n' ' ')
-
-          # Check if the extracted package name is a valid package in the workspace root Cargo.toml
-          if [[ ! " $PACKAGE_NAMES " =~ " $PACKAGE_NAME " ]]; then
-            echo "Invalid package name: $PACKAGE_NAME"
-            exit 1
-          fi
-          echo "Package to publish: $PACKAGE_NAME"
-          echo "::set-output name=package::$PACKAGE_NAME"
-        shell: bash
-        working-directory: ${{ github.workspace }}
-
-      - name: Check Package Version
-        id: check-version
-        run: |
-          PACKAGE_NAME="${{ steps.determine-package.outputs.package }}"
-          TAG_VERSION=$(echo "${{ github.ref }}" | cut -d'@' -f2)
-          MANIFEST_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r --arg PACKAGE_NAME "$PACKAGE_NAME" '.packages[] | select(.name == $PACKAGE_NAME) | .version')
-
-          if [ "$TAG_VERSION" != "$MANIFEST_VERSION" ]; then
-            echo "Package version in manifest $MANIFEST_VERSION does not match tag version $TAG_VERSION."
-            exit 1
-          else
-            echo "Package version in manifest matches tag version."
-          fi
-        shell: bash
-        working-directory: ${{ github.workspace }}
-
-      - name: Build and Publish
+
+      - name: Publish Package on crates.io if required
         run: |
-          PACKAGE_NAME="${{ steps.determine-package.outputs.package }}"
-
-          # Publish the specified package within the workspace to crates.io
-          cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --package "$PACKAGE_NAME"
+          # Iterate through package names retrieved
+          PACKAGE_NAMES="testmacro include_gif ledger_secure_sdk_sys ledger_device_sdk"
+          for PACKAGE_NAME in $PACKAGE_NAMES; do
+            # Publish each package within the workspace if required
+            last_published_version=$(cargo search -q --limit 1 $PACKAGE_NAME | grep -oP '\d+\.\d+\.\d+')
+            echo "Published version of $PACKAGE_NAME is $last_published_version"
+            manifest_version=$(cargo metadata --format-version=1 --no-deps | jq -r --arg PACKAGE_NAME "$PACKAGE_NAME" '.packages[] | select(.name == $PACKAGE_NAME) | .version')
+            echo "Current version in manifest for $PACKAGE_NAME is $manifest_version"
+            if [ "$last_published_version" == "$manifest_version" ]; then
+              echo "Package $PACKAGE_NAME is already published with version $manifest_version."
+            else
+              echo "Package $PACKAGE_NAME with version $manifest_version is not published."
+              echo "Publishing $PACKAGE_NAME..."
+              cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --package "$PACKAGE_NAME"
+            fi
+          done
         env:
           CARGO_TERM_COLOR: always
         working-directory: ${{ github.workspace }}