Skip to content

Commit

Permalink
Merge pull request #93 from LedgerHQ/develop
Browse files Browse the repository at this point in the history
Merge develop on master with small fix
  • Loading branch information
xchapron-ledger authored Oct 10, 2023
2 parents fed306d + 19153d0 commit a34dd84
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 10 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/build_and_functional_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Build and run functional tests using ragger through reusable workflow

# This workflow will build the app.
# It calls a reusable workflow developed by Ledger's internal developer team to build the application and upload the
# resulting binaries.
on:
workflow_dispatch:
push:
branches:
- master
- main
- develop
pull_request:

jobs:
build_application:
name: Build application using the reusable workflow
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_build.yml@v1
with:
upload_app_binaries_artifact: "compiled_app_binaries"
run_for_devices: '["nanos", "nanox", "nanosp"]'
25 changes: 25 additions & 0 deletions .github/workflows/guidelines_enforcer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Ensure compliance with Ledger guidelines

# This workflow is mandatory in all applications
# It calls a reusable workflow guidelines_enforcer developed by Ledger's internal developer team.
# The successful completion of the reusable workflow is a mandatory step for an app to be available on the Ledger
# application store.
#
# More information on the guidelines can be found in the repository:
# LedgerHQ/ledger-app-workflows/

on:
workflow_dispatch:
push:
branches:
- master
- main
- develop
pull_request:

jobs:
guidelines_enforcer:
name: Call Ledger guidelines_enforcer
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1
with:
run_for_devices: '["nanos", "nanox", "nanosp"]'
16 changes: 6 additions & 10 deletions src/sdk/usbd_impl.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,14 @@
/* With https://github.com/LedgerHQ/ledger-secure-sdk/pull/188
* a new feature was implemented to allow HID communication with a
* manually passed destination buffer.
* This feature changed the API of HID communication and wasn't backported
* on all SDK version. It is only available on SDK from:
* - the unified SDK, so with API_LEVEL defined
* - API_LEVEL value either:
* - equal to 0: master branch
* - >= 9 which was the first API_LEVEL created after the merge of #188
* This feature changed the API of HID communication and was backported
* on all SDK version starting from:
* - nanos: v2.1.0-12
* - API_LEVEL_1: v1.9.0
* - API_LEVEL_5: v5.7.0
* - API_LEVEL >= 9 always been available
*/
#ifdef API_LEVEL
#if API_LEVEL == 0 || API_LEVEL >= 9
#define HAVE_LOCAL_APDU_BUFFER_FEATURE
#endif
#endif

#include "os.h"

Expand Down

0 comments on commit a34dd84

Please sign in to comment.