From 55f52e2d703a8e3f67f58c692f50bf7b84eb2c08 Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Wed, 4 Sep 2019 10:53:40 +0200 Subject: [PATCH] ci: reorder titles of Jobs for a better overview --- ci/build.yml | 25 +++++++++++++------------ ci/prebuild.yml | 6 +++--- ci/test.yml | 39 ++++++++++++++++++++------------------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 6e9b46850..c46b350eb 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -30,9 +30,10 @@ variables: - tools/**/* - vendor/**/* + # Core -build core firmware regular: +core fw regular build: stage: build <<: *only_changes_core script: @@ -52,7 +53,7 @@ build core firmware regular: - trezor-*.*.*-$CI_COMMIT_SHORT_SHA.bin expire_in: 1 week -build core firmware bitcoinonly: +core fw btconly build: stage: build <<: *only_changes_core variables: @@ -71,14 +72,14 @@ build core firmware bitcoinonly: - trezor-*.*.*-$CI_COMMIT_SHORT_SHA-bitcoinonly.bin expire_in: 1 week -build core unix regular: +core unix regular build: stage: build <<: *only_changes_core script: - cd core - pipenv run make build_unix -build core unix frozen regular: +core unix frozen regular build: stage: build <<: *only_changes_core script: @@ -91,7 +92,7 @@ build core unix frozen regular: - core/src/trezor/res/resources.py expire_in: 1 week -build core unix frozen bitcoinonly: +core unix frozen btconly build: stage: build <<: *only_changes_core variables: @@ -107,7 +108,7 @@ build core unix frozen bitcoinonly: - core/src/trezor/res/resources.py expire_in: 1 week -build core unix frozen debug: +core unix frozen debug build: stage: build <<: *only_changes_core variables: @@ -123,7 +124,7 @@ build core unix frozen debug: # Crypto -build crypto: +crypto build: stage: build only: changes: @@ -145,7 +146,7 @@ build crypto: # Legacy # TODO: add clang https://github.com/trezor/trezor-firmware/issues/44 -build legacy firmware regular: +legacy fw regular build: stage: build <<: *only_changes_legacy variables: @@ -164,7 +165,7 @@ build legacy firmware regular: - trezor-*.*.*-$CI_COMMIT_SHORT_SHA.bin expire_in: 1 week -build legacy firmware debug: +legacy fw debug build: stage: build <<: *only_changes_legacy variables: @@ -174,7 +175,7 @@ build legacy firmware debug: - cd legacy - pipenv run script/cibuild -build legacy firmware bitcoinonly: +legacy fw btconly build: stage: build <<: *only_changes_legacy variables: @@ -194,7 +195,7 @@ build legacy firmware bitcoinonly: - trezor-*.*.*-$CI_COMMIT_SHORT_SHA-bitcoinonly.bin expire_in: 1 week -build legacy emu regular: +legacy emu regular build: stage: build <<: *only_changes_legacy variables: @@ -209,7 +210,7 @@ build legacy emu regular: - legacy/firmware/trezor.elf expire_in: 1 week -build legacy emu bitcoinonly: +legacy emu btconly build: stage: build <<: *only_changes_legacy variables: diff --git a/ci/prebuild.yml b/ci/prebuild.yml index b3e50fcc8..e62f58c85 100644 --- a/ci/prebuild.yml +++ b/ci/prebuild.yml @@ -1,6 +1,6 @@ image: registry.gitlab.com/satoshilabs/trezor/trezor-firmware/environment -prebuild style: +style prebuild: stage: prebuild only: changes: @@ -11,7 +11,7 @@ prebuild style: script: - pipenv run make style_check -prebuild common: +common prebuild: stage: prebuild only: changes: @@ -21,7 +21,7 @@ prebuild common: script: - pipenv run make defs_check -prebuild gen: +gen prebuild: stage: prebuild only: changes: diff --git a/ci/test.yml b/ci/test.yml index a25a80efa..8f48b3f3c 100644 --- a/ci/test.yml +++ b/ci/test.yml @@ -26,31 +26,32 @@ image: registry.gitlab.com/satoshilabs/trezor/trezor-firmware/environment - tools/**/* - vendor/**/* + # Core -test core unix unit: +core unix unit test: stage: test <<: *only_changes_core dependencies: - - build core unix frozen regular + - core unix frozen regular build script: - cd core - pipenv run make test -test core unix device: +core unix device test: stage: test <<: *only_changes_core dependencies: - - build core unix frozen regular + - core unix frozen regular build script: - cd core - pipenv run make test_emu -test core unix device bitcoinonly: +core unix btconly device test: stage: test <<: *only_changes_core dependencies: - - build core unix frozen bitcoinonly + - core unix frozen btconly build variables: MICROPYTHON: "../build/unix/micropython-bitcoinonly" TREZOR_PYTEST_SKIP_ALTCOINS: 1 @@ -58,11 +59,11 @@ test core unix device bitcoinonly: - cd core - pipenv run make test_emu -test core unix monero: +core unix monero test: stage: test <<: *only_changes_core dependencies: - - build core unix frozen regular + - core unix frozen regular build script: - cd core - pipenv run make test_emu_monero @@ -70,14 +71,14 @@ test core unix monero: # Crypto -test crypto: +crypto test: stage: test only: changes: - ci/**/* - crypto/**/* dependencies: - - build crypto + - crypto build script: - cd crypto - ./tests/aestst @@ -89,22 +90,22 @@ test crypto: # Legacy -test legacy emu: +legacy emu test: stage: test <<: *only_changes_legacy dependencies: - - build legacy emu regular + - legacy emu regular build variables: EMULATOR: "1" script: - cd legacy - pipenv run script/test -test legacy emu bitcoinonly: +legacy emu btconly test: stage: test <<: *only_changes_legacy dependencies: - - build legacy emu bitcoinonly + - legacy emu btconly build variables: EMULATOR: "1" EMULATOR_BINARY: "firmware/trezor-bitcoinonly.elf" @@ -116,7 +117,7 @@ test legacy emu bitcoinonly: # Python -test python: +python test: stage: test only: changes: @@ -129,7 +130,7 @@ test python: # Storage -test storage: +storage test: stage: test only: changes: @@ -144,13 +145,13 @@ test storage: # Other -test upgrade: +upgrade test: stage: test <<: *only_changes_core <<: *only_changes_legacy dependencies: - - build core unix frozen debug - - build legacy emu regular + - core unix frozen debug build + - legacy emu regular build script: - tests/upgrade_tests/download_emulators.sh - pipenv run pytest tests/upgrade_tests