arno
/
trezor-firmware
mirror of https://github.com/trezor/trezor-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ci: drop cached-nix-shell

Browse Source
pull/2841/head
Martin Milata 1 year ago committed by matejcik
parent 966e5d8286
commit 7408f169cb
6 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
.gitlab-ci.yml
Unescape View File

@ -20,9 +20,7 @@ variables:
# No need for TLS because everything runs on the same machine # No need for TLS because everything runs on the same machine
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
# Hardware tests don't use docker so there's no benefit of prebuilt cache, however they NIX_SHELL: "nix-shell"
# still run the before_script from this file.
NIX_SHELL: "cached-nix-shell"
stages: stages:
- environment - environment

4
ci/Dockerfile
Unescape View File

@ -50,7 +50,5 @@ ARG FULLDEPS_TESTING=0
ENV FULLDEPS_TESTING=${FULLDEPS_TESTING} ENV FULLDEPS_TESTING=${FULLDEPS_TESTING}
RUN nix-shell --arg fullDeps "$([ ${FULLDEPS_TESTING} = 1 ] && echo true || echo false)" --run "echo deps pre-installed" RUN nix-shell --arg fullDeps "$([ ${FULLDEPS_TESTING} = 1 ] && echo true || echo false)" --run "echo deps pre-installed"
RUN nix-env -iA nixpkgs.cached-nix-shell
RUN cached-nix-shell --arg fullDeps "$([ ${FULLDEPS_TESTING} = 1 ] && echo true || echo false)" --run "echo cached-nix-shell initialized"
CMD [ "cached-nix-shell" ] CMD [ "nix-shell" ]

2
ci/build.yml
Unescape View File

@ -263,7 +263,6 @@ core unix frozen debug build arm:
- /^secfix\// - /^secfix\//
variables: variables:
PYOPT: "0" PYOPT: "0"
NIX_SHELL: "nix-shell"
script: script:
- $NIX_SHELL --run "poetry run make -C core build_unix_frozen" - $NIX_SHELL --run "poetry run make -C core build_unix_frozen"
- mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-arm - mv core/build/unix/trezor-emu-core core/build/unix/trezor-emu-core-arm
@ -447,7 +446,6 @@ legacy emu regular debug build arm:
variables: variables:
DEBUG_LINK: "1" DEBUG_LINK: "1"
EMULATOR: "1" EMULATOR: "1"
NIX_SHELL: "nix-shell"
script: script:
- $NIX_SHELL --run "poetry run legacy/script/cibuild" - $NIX_SHELL --run "poetry run legacy/script/cibuild"
- mv legacy/firmware/trezor.elf legacy/firmware/trezor-arm.elf - mv legacy/firmware/trezor.elf legacy/firmware/trezor-arm.elf

1
ci/shell.nix
Unescape View File

@ -94,7 +94,6 @@ stdenvNoCC.mkDerivation ({
moreutils moreutils
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
autoPatchelfHook autoPatchelfHook
cached-nix-shell
procps procps
valgrind valgrind
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [

6
ci/test-hw.yml
Unescape View File

@ -36,7 +36,6 @@ hardware core regular device test:
- core fw regular debug build - core fw regular debug build
variables: variables:
PYTEST_TIMEOUT: "1200" PYTEST_TIMEOUT: "1200"
NIX_SHELL: "nix-shell"
script: script:
- cd ci/hardware_tests - cd ci/hardware_tests
- set -a - set -a
@ -67,7 +66,6 @@ hardware core btconly device test:
variables: variables:
TREZOR_PYTEST_SKIP_ALTCOINS: 1 TREZOR_PYTEST_SKIP_ALTCOINS: 1
PYTEST_TIMEOUT: "1200" PYTEST_TIMEOUT: "1200"
NIX_SHELL: "nix-shell"
script: script:
- cd ci/hardware_tests - cd ci/hardware_tests
- set -a - set -a
@ -95,7 +93,6 @@ hardware core monero test:
- core fw regular debug build - core fw regular debug build
variables: variables:
TESTOPTS: --trezor_path webusb TESTOPTS: --trezor_path webusb
NIX_SHELL: "nix-shell"
script: script:
- cd ci/hardware_tests - cd ci/hardware_tests
- set -a - set -a
@ -125,8 +122,6 @@ hardware legacy regular device test:
- tpmb - tpmb
needs: needs:
- legacy fw regular debug build - legacy fw regular debug build
variables:
NIX_SHELL: "nix-shell"
script: script:
- cd ci/hardware_tests - cd ci/hardware_tests
- $NIX_SHELL --run "./t1_hw_test.sh | ts -s" - $NIX_SHELL --run "./t1_hw_test.sh | ts -s"
@ -143,7 +138,6 @@ hardware legacy btconly device test:
stage: test stage: test
variables: variables:
TREZOR_PYTEST_SKIP_ALTCOINS: 1 TREZOR_PYTEST_SKIP_ALTCOINS: 1
NIX_SHELL: "nix-shell"
only: only:
- schedules # nightly build - schedules # nightly build
- /^legacy\// - /^legacy\//

30
docs/ci/jobs.md
Unescape View File

@ -101,32 +101,32 @@ it is just a single binary file that you can execute directly.
### [core unix frozen debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L254) ### [core unix frozen debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L254)
### [core macos frozen regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L277) ### [core macos frozen regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L276)
### [crypto build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L302) ### [crypto build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L301)
Build of our cryptographic library, which is then incorporated into the other builds. Build of our cryptographic library, which is then incorporated into the other builds.
### [legacy fw regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L331) ### [legacy fw regular build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L330)
### [legacy fw regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L347) ### [legacy fw regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L346)
### [legacy fw btconly build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L364) ### [legacy fw btconly build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L363)
### [legacy fw btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L383) ### [legacy fw btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L382)
### [legacy emu regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L404) ### [legacy emu regular debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L403)
Regular version (not only Bitcoin) of above. Regular version (not only Bitcoin) of above.
**Are you looking for a Trezor One emulator? This is most likely it.** **Are you looking for a Trezor One emulator? This is most likely it.**
### [legacy emu regular debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L419) ### [legacy emu regular debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L418)
### [legacy emu regular debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L437) ### [legacy emu regular debug build arm](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L436)
### [legacy emu btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L464) ### [legacy emu btconly debug build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L462)
Build of Legacy into UNIX emulator. Use keyboard arrows to emulate button presses. Build of Legacy into UNIX emulator. Use keyboard arrows to emulate button presses.
Bitcoin-only version. Bitcoin-only version.
### [legacy emu btconly debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L481) ### [legacy emu btconly debug asan build](https://github.com/trezor/trezor-firmware/blob/master/ci/build.yml#L479)
--- ---
## TEST stage - [test.yml](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml) ## TEST stage - [test.yml](https://github.com/trezor/trezor-firmware/blob/master/ci/test.yml)
@ -235,17 +235,17 @@ a state where the micropython heap is too fragmented and allocations fail
skipped. skipped.
See also: https://github.com/trezor/trezor-firmware/issues/1371 See also: https://github.com/trezor/trezor-firmware/issues/1371
### [hardware core btconly device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L55) ### [hardware core btconly device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L54)
Also device tests on physical Trezor T but with Bitcoin-only firmware. Also device tests on physical Trezor T but with Bitcoin-only firmware.
### [hardware core monero test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L85) ### [hardware core monero test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L83)
### [hardware legacy regular device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L116) ### [hardware legacy regular device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L113)
[Device tests](../tests/device-tests.md) executed on physical Trezor 1. [Device tests](../tests/device-tests.md) executed on physical Trezor 1.
This works thanks to [tpmb](https://github.com/mmahut/tpmb), which is a small arduino This works thanks to [tpmb](https://github.com/mmahut/tpmb), which is a small arduino
device capable of pushing an actual buttons on the device. device capable of pushing an actual buttons on the device.
### [hardware legacy btconly device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L142) ### [hardware legacy btconly device test](https://github.com/trezor/trezor-firmware/blob/master/ci/test-hw.yml#L137)
Also device tests on physical Trezor 1 but with Bitcoin-only firmware. Also device tests on physical Trezor 1 but with Bitcoin-only firmware.
--- ---

Write Preview
Loading…
Cancel
Save