Skip to content

Fix CI (#364) #365

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 3, 2025
Merged

Fix CI (#364) #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
143 changes: 125 additions & 18 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,49 +58,99 @@ jobs:
cd ./app/rust
cargo clippy --all-targets --features "full,clippy"

setup_rust:
runs-on: ubuntu-latest
outputs:
cargo_home: ${{ steps.set_paths.outputs.cargo_home }}
rustup_home: ${{ steps.set_paths.outputs.rustup_home }}
steps:
- id: set_paths
run: |
echo "cargo_home=$GITHUB_WORKSPACE/app/rust/.cargo" >> $GITHUB_OUTPUT
echo "rustup_home=$GITHUB_WORKSPACE/app/rust/.rustup" >> $GITHUB_OUTPUT

build_ledger:
needs: configure
needs: [configure, setup_rust]
runs-on: ubuntu-latest
container:
image: zondax/ledger-app-builder:latest
options: --user ${{ needs.configure.outputs.uid_gid }}
options: --user root
env:
BOLOS_SDK: /opt/nanosplus-secure-sdk
HOME: /root
CARGO_HOME: ${{ needs.setup_rust.outputs.cargo_home }}
RUSTUP_HOME: ${{ needs.setup_rust.outputs.rustup_home }}
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${{ needs.setup_rust.outputs.cargo_home }}/bin
outputs:
size: ${{steps.build.outputs.size}}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup Rust environment
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: thumbv6m-none-eabi
override: true
- name: Cache Rust dependencies
uses: actions/cache@v3
with:
path: |
${{ needs.setup_rust.outputs.cargo_home }}
target/
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-rust-
- name: Build Standard app
id: build
shell: bash -l {0}
run: |
make PRODUCTION_BUILD=0
echo "size=$(python3 deps/ledger-zxlib/scripts/getSize.py s)" >> $GITHUB_OUTPUT
echo "size=$(python3 deps/ledger-zxlib/scripts/getSize.py s2)" >> $GITHUB_OUTPUT

build_ledger_production:
needs: configure
needs: [configure, setup_rust]
runs-on: ubuntu-latest
container:
image: zondax/ledger-app-builder:latest
options: --user ${{ needs.configure.outputs.uid_gid }}
options: --user root
env:
BOLOS_SDK: /opt/nanosplus-secure-sdk
HOME: /root
CARGO_HOME: ${{ needs.setup_rust.outputs.cargo_home }}
RUSTUP_HOME: ${{ needs.setup_rust.outputs.rustup_home }}
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${{ needs.setup_rust.outputs.cargo_home }}/bin
outputs:
size: ${{steps.build.outputs.size}}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup Rust environment
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: thumbv6m-none-eabi
override: true
profile: minimal
- name: Cache Rust dependencies
uses: actions/cache@v3
with:
path: |
${{ needs.setup_rust.outputs.cargo_home }}
target/
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-rust-
- name: Build Production app
id: build
shell: bash -l {0}
run: |
make PRODUCTION_BUILD=1
echo "size=$(python3 deps/ledger-zxlib/scripts/getSize.py s)" >> $GITHUB_OUTPUT
echo "size=$(python3 deps/ledger-zxlib/scripts/getSize.py s2)" >> $GITHUB_OUTPUT

tests_zemu_setup:
if: ${{ !contains(toJSON(github.event.commits[*].message), '[skip-zemu]') }}
Expand Down Expand Up @@ -182,22 +232,41 @@ jobs:
path: tests_zemu/snapshots-tmp/

build_package_nanosp:
needs: [configure, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
needs: [configure, setup_rust, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
if: ${{ github.ref == 'refs/heads/main' }}
runs-on: ubuntu-latest
container:
image: zondax/ledger-app-builder:latest
options: --user ${{ needs.configure.outputs.uid_gid }}
options: --user root
env:
BOLOS_SDK: /opt/nanosplus-secure-sdk
HOME: /root
CARGO_HOME: ${{ needs.setup_rust.outputs.cargo_home }}
RUSTUP_HOME: ${{ needs.setup_rust.outputs.rustup_home }}
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${{ needs.setup_rust.outputs.cargo_home }}/bin
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup Rust environment
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: thumbv6m-none-eabi
override: true
profile: minimal
- name: Cache Rust dependencies
uses: actions/cache@v3
with:
path: |
${{ needs.setup_rust.outputs.cargo_home }}
target/
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-rust-
- name: Install deps
run: pip install ledgerblue

run: pip install --break-system-packages ledgerblue
- name: Build NanoSP
shell: bash -l {0}
run: |
Expand All @@ -218,22 +287,41 @@ jobs:
prerelease: false

build_package_stax:
needs: [configure, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
needs: [configure, setup_rust, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
if: ${{ github.ref == 'refs/heads/main' }}
runs-on: ubuntu-latest
container:
image: zondax/ledger-app-builder:latest
options: --user ${{ needs.configure.outputs.uid_gid }}
options: --user root
env:
BOLOS_SDK: /opt/stax-secure-sdk
HOME: /root
CARGO_HOME: ${{ needs.setup_rust.outputs.cargo_home }}
RUSTUP_HOME: ${{ needs.setup_rust.outputs.rustup_home }}
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${{ needs.setup_rust.outputs.cargo_home }}/bin
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup Rust environment
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: thumbv6m-none-eabi
override: true
profile: minimal
- name: Cache Rust dependencies
uses: actions/cache@v3
with:
path: |
${{ needs.setup_rust.outputs.cargo_home }}
target/
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-rust-
- name: Install deps
run: pip install ledgerblue

run: pip install --break-system-packages ledgerblue
- name: Build Stax
shell: bash -l {0}
run: |
Expand All @@ -254,22 +342,41 @@ jobs:
prerelease: false

build_package_flex:
needs: [configure, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
needs: [configure, setup_rust, build_ledger, tests_zemu_setup, test_zemu, rust_tests]
if: ${{ github.ref == 'refs/heads/main' }}
runs-on: ubuntu-latest
container:
image: zondax/ledger-app-builder:latest
options: --user ${{ needs.configure.outputs.uid_gid }}
options: --user root
env:
BOLOS_SDK: /opt/flex-secure-sdk
HOME: /root
CARGO_HOME: ${{ needs.setup_rust.outputs.cargo_home }}
RUSTUP_HOME: ${{ needs.setup_rust.outputs.rustup_home }}
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${{ needs.setup_rust.outputs.cargo_home }}/bin
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup Rust environment
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: thumbv6m-none-eabi
override: true
profile: minimal
- name: Cache Rust dependencies
uses: actions/cache@v3
with:
path: |
${{ needs.setup_rust.outputs.cargo_home }}
target/
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-rust-
- name: Install deps
run: pip install ledgerblue

run: pip install --break-system-packages ledgerblue
- name: Build Flex
shell: bash -l {0}
run: |
Expand Down
2 changes: 0 additions & 2 deletions app/Makefile.erc20
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ CHAIN_ID = 43114
TICKER = "AVAX"

CFLAGS += -DMAJOR_VERSION=$(APPVERSION_M) -DMINOR_VERSION=$(APPVERSION_N) -DPATCH_VERSION=$(APPVERSION_P)
# Suppress warning about unused but set variable
CFLAGS += -Wno-unused-but-set-variable

DEFINES += HAVE_ETH_INTEGRATION HAVE_ETH2 USE_LIB_ETHEREUM
DEFINES += HAVE_BYPASS_SIGNATURES
Expand Down
2 changes: 1 addition & 1 deletion deps/ethereum
Open in desktop
Submodule ethereum updated 6 files
+1 −1 .gitmodules
+1 −1 ethereum-plugin-sdk
+2 −0 src/ethUstream.c
+1 −0 src/eth_plugin_handler.c
+1 −0 src_features/setExternalPlugin/cmd_setExternalPlugin.c
+1 −0 src_features/setPlugin/cmd_setPlugin.c
Loading