Skip to content

Commit

Permalink
Merge #94: ci: Fix building trezor-firmware in Docker
Browse files Browse the repository at this point in the history
7c957d1 ci: Fix building trezor-firmware in Docker (Jiri Jakes)

Pull request description:

  - installs poetry from Debian package instead of pip
  - removes dependency on pyblake2 from trezor-firwmare (it's not used anywhere)
  - updates to wrapt 1.14.1 since the default 1.13.3 does not build on Python 3.11
  - upgrades trezor-firwmare to 2.6.4

  Tests pass on my machine with this setup.

  Some of the changes should go to upstream (not yet sure if I try to). Weird is that nobody is complaining about it there, even though on my machine I encountered the same failures as in the Docker build.

  If stars are aligned, should fix #93.

ACKs for top commit:
  danielabrozzoni:
    ACK 7c957d1

Tree-SHA512: dc27c4f3f3c65bd037f06d6d2c2288f47840703dea4b908693f3478edeb0d9e401604e6f483b043a4233d375bb9ab4e54bfd8c3c21424a413f760c9ddd125432
  • Loading branch information
danielabrozzoni committed Jan 22, 2024
2 parents 530e026 + 7c957d1 commit 98b4ea6
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions ci/Dockerfile.trezor
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@ FROM rust
RUN rustup toolchain install nightly
RUN rustup default nightly
RUN apt-get update
RUN apt-get install scons libsdl2-dev python3 python3-pip libsdl2-image-dev llvm-dev libclang-dev clang protobuf-compiler libusb-1.0-0-dev -y
RUN git clone --recursive -b core/v2.5.3 https://github.com/trezor/trezor-firmware/ trezor-firmware
RUN apt-get install scons libsdl2-dev python3 python3-pip python3-poetry libsdl2-image-dev llvm-dev libclang-dev clang protobuf-compiler libusb-1.0-0-dev -y
RUN git clone --recursive -b core/v2.6.4 https://github.com/trezor/trezor-firmware/ trezor-firmware
WORKDIR /trezor-firmware/core
RUN pip install poetry

# pyblake2 broken on 3.11, trezor-firmware does not use it but depends on it => remove it as dependency
RUN sed -i "/pyblake.*/d" ../pyproject.toml

# build wrapt 1.13.3 fails => update to 1.14.1
RUN poetry add "wrapt==1.14.1"

RUN poetry install
RUN poetry run make build_unix
CMD ["poetry", "run", "./emu.py", "--headless", "--slip0014", "-q"]

0 comments on commit 98b4ea6

Please sign in to comment.