Merge branch 'master' into zcash-unified-addresses-2

trezor · Aug 9, 2022 · d872ac0 · d872ac0
2 parents d989a8f + f538547
commit d872ac0
Show file tree

Hide file tree

Showing 91 changed files with 4,175 additions and 1,623 deletions.
diff --git a/ci/build.yml b/ci/build.yml
@@ -306,6 +306,7 @@ core unix frozen debug build arm:
 
 core unix frozen btconly debug t1 build:
   stage: build
+  <<: *gitlab_caching
   needs: []
   variables:
     BITCOIN_ONLY: "1"

diff --git a/ci/prebuild.yml b/ci/prebuild.yml
@@ -19,7 +19,7 @@ style prebuild:
     GIT_SUBMODULE_STRATEGY: "none"
   <<: *gitlab_caching
   script:
-    - nix-shell --run "poetry run make style_check"
+    - nix-shell --run "poetry run make -j1 style_check"
 
 # Check validity of coin definitions and protobuf files.
 common prebuild:
@@ -33,7 +33,7 @@ gen prebuild:
   stage: prebuild
   <<: *gitlab_caching
   script:
-    - nix-shell --run "poetry run make gen_check"
+    - nix-shell --run "poetry run make -j1 gen_check"
 
 # Checking format of .editorconfig files.
 editor prebuild:

diff --git a/ci/shell.nix b/ci/shell.nix
@@ -70,7 +70,6 @@ stdenvNoCC.mkDerivation ({
   ] ++ [
     SDL2
     SDL2_image
-    autoflake
     bash
     check
     curl  # for connect tests