diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45082f9a5..e2f905035 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,9 +20,7 @@ variables: # No need for TLS because everything runs on the same machine DOCKER_TLS_CERTDIR: "" - # Hardware tests don't use docker so there's no benefit of prebuilt cache, however they - # still run the before_script from this file. - NIX_SHELL: "cached-nix-shell" + NIX_SHELL: "nix-shell" stages: - environment diff --git a/ci/Dockerfile b/ci/Dockerfile index 904df07a9..6df7d784d 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -50,7 +50,5 @@ ARG FULLDEPS_TESTING=0 ENV FULLDEPS_TESTING=${FULLDEPS_TESTING} 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" ] diff --git a/ci/build.yml b/ci/build.yml index e4d668c65..edd0c245b 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -263,7 +263,6 @@ core unix frozen debug build arm: - /^secfix\// variables: PYOPT: "0" - NIX_SHELL: "nix-shell" script: - $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 @@ -447,7 +446,6 @@ legacy emu regular debug build arm: variables: DEBUG_LINK: "1" EMULATOR: "1" - NIX_SHELL: "nix-shell" script: - $NIX_SHELL --run "poetry run legacy/script/cibuild" - mv legacy/firmware/trezor.elf legacy/firmware/trezor-arm.elf diff --git a/ci/shell.nix b/ci/shell.nix index 49fb13651..6f5a3f1d2 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -94,7 +94,6 @@ stdenvNoCC.mkDerivation ({ moreutils ] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook - cached-nix-shell procps valgrind ] ++ lib.optionals (stdenv.isDarwin) [ diff --git a/ci/test-hw.yml b/ci/test-hw.yml index f4b4c4950..b909192b4 100644 --- a/ci/test-hw.yml +++ b/ci/test-hw.yml @@ -36,7 +36,6 @@ hardware core regular device test: - core fw regular debug build variables: PYTEST_TIMEOUT: "1200" - NIX_SHELL: "nix-shell" script: - cd ci/hardware_tests - set -a @@ -67,7 +66,6 @@ hardware core btconly device test: variables: TREZOR_PYTEST_SKIP_ALTCOINS: 1 PYTEST_TIMEOUT: "1200" - NIX_SHELL: "nix-shell" script: - cd ci/hardware_tests - set -a @@ -95,7 +93,6 @@ hardware core monero test: - core fw regular debug build variables: TESTOPTS: --trezor_path webusb - NIX_SHELL: "nix-shell" script: - cd ci/hardware_tests - set -a @@ -125,8 +122,6 @@ hardware legacy regular device test: - tpmb needs: - legacy fw regular debug build - variables: - NIX_SHELL: "nix-shell" script: - cd ci/hardware_tests - $NIX_SHELL --run "./t1_hw_test.sh | ts -s" @@ -143,7 +138,6 @@ hardware legacy btconly device test: stage: test variables: TREZOR_PYTEST_SKIP_ALTCOINS: 1 - NIX_SHELL: "nix-shell" only: - schedules # nightly build - /^legacy\// diff --git a/docs/ci/jobs.md b/docs/ci/jobs.md index b24d61625..72f6493d8 100644 --- a/docs/ci/jobs.md +++ b/docs/ci/jobs.md @@ -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 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. -### [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. **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. 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) @@ -235,17 +235,17 @@ a state where the micropython heap is too fragmented and allocations fail skipped. 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. -### [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. 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. -### [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. ---