Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC2A-1408: Fix duplicate symbols #9

Merged
merged 9 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build
run: |
make

- name: Upload app binary
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: hive-app
path: bin
Expand All @@ -36,13 +36,16 @@ jobs:
name: Unit test
needs: job_build_debug
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-legacy:latest

steps:
- name: Install required packages
run: |
apt update && apt install -qy libcmocka-dev lcov doxygen

- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build unit tests
run: |
Expand All @@ -54,13 +57,13 @@ jobs:
cd unit-tests/
./gen_coverage.sh

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: code-coverage
path: unit-tests/coverage

- name: Upload to codecov.io
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./unit-tests/coverage.info
Expand All @@ -72,13 +75,11 @@ jobs:
- name: HTML documentation
run: doxygen .doxygen/Doxyfile

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: documentation
path: doc/html



job_test:
name: Test
needs: job_build_debug
Expand All @@ -97,19 +98,17 @@ jobs:

steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install required packages
run: |
apt update && apt install -qy curl unzip wget gcc # /!\ workaround for pysha3
apt update && apt install -qy npm curl unzip wget gcc # /!\ workaround for pysha3

- name: Prepare NodeJS environment
run: |
curl -sL https://deb.nodesource.com/setup_14.x | bash
apt-get install nodejs -yq
uses: actions/setup-node@v3

- name: Download app binary
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: hive-app
path: bin
Expand All @@ -120,7 +119,7 @@ jobs:
cd test && npm ci && npm test

- name: Upload Speculos log
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: speculos-log
path: speculos.log
22 changes: 5 additions & 17 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,23 @@ jobs:
name: Analyse
runs-on: ubuntu-latest
container:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
permissions:
actions: read
contents: read
security-events: write

strategy:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest
strategy:
matrix:
sdk: [ "$NANOS_SDK", "$NANOX_SDK", "$NANOSP_SDK" ]
#'cpp' covers C and C++
language: [ 'cpp' ]
sdk: ["$NANOS_SDK", "$NANOX_SDK", "$NANOSP_SDK"]

steps:
- name: Adding GitHub workspace as safe directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE

- name: Clone
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
languages: cpp
queries: security-and-quality

# CodeQL will create the database during the compilation
- name: Build
run: |
make BOLOS_SDK=${{ matrix.sdk }}

make -j BOLOS_SDK=${{ matrix.sdk }}
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
24 changes: 24 additions & 0 deletions .github/workflows/coding_style_checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Run coding style check through reusable workflow

# This workflow will run linting checks to ensure a level of uniformization among all Ledger applications.
#
# The presence of this workflow is mandatory as a minimal level of linting is required.
# You are however free to modify the content of the .clang-format file and thus the coding style of your application.
# We simply ask you to not diverge too much from the linting of the Boilerplate application.

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

jobs:
check_linting:
name: Check linting using the reusable workflow
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_lint.yml@v1
with:
source: './src'
extensions: 'h,c'
version: 11
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
- 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"]'

28 changes: 0 additions & 28 deletions .github/workflows/lint-workflow.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)
APPNAME = "Hive"
APPVERSION_M = 1
APPVERSION_N = 1
APPVERSION_P = 0
APPVERSION_P = 1
APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"

ifeq ($(TARGET_NAME),TARGET_NANOS)
Expand Down
Binary file modified glyphs/hive_logo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/icon_back.gif
Binary file not shown.
Binary file removed glyphs/icon_back_x.gif
Binary file not shown.
Binary file removed glyphs/icon_certificate.gif
Binary file not shown.
Binary file removed glyphs/icon_coggle.gif
Binary file not shown.
Binary file removed glyphs/icon_crossmark.gif
Binary file not shown.
Binary file removed glyphs/icon_dashboard.gif
Binary file not shown.
Binary file removed glyphs/icon_dashboard_x.gif
Binary file not shown.
Binary file removed glyphs/icon_down.gif
Binary file not shown.
Binary file removed glyphs/icon_eye.gif
Binary file not shown.
Binary file removed glyphs/icon_left.gif
Binary file not shown.
Binary file removed glyphs/icon_processing.gif
Binary file not shown.
Binary file removed glyphs/icon_right.gif
Binary file not shown.
Binary file removed glyphs/icon_up.gif
Binary file not shown.
Binary file removed glyphs/icon_validate_14.gif
Binary file not shown.
Binary file removed glyphs/icon_warning.gif
Binary file not shown.
Loading
Loading