From 1634baa1e5b79577461f93c578ab4e6e0d9e6070 Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Mon, 20 Apr 2020 20:14:22 +0200 Subject: [PATCH] ci: remove 'only changes' --- .gitlab-ci.yml | 28 ---------------------------- ci/build.yml | 12 ------------ ci/deploy.yml | 1 - ci/posttest.yml | 2 -- ci/test.yml | 14 -------------- 5 files changed, 57 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3873591ad..4c63aefbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,34 +35,6 @@ stages: before_script: - command -v pipenv >/dev/null && pipenv sync --python=/usr/bin/python3 -.core_job: - only: - changes: - - ci/**/* - - common/**/* - - core/**/* - - crypto/**/* - - python/**/* - - storage/**/* - - tests/**/* - - tools/**/* - - vendor/**/* - - Pipfile.lock - -.legacy_job: - only: - changes: - - ci/**/* - - common/**/* - - crypto/**/* - - legacy/**/* - - python/**/* - - storage/**/* - - tests/**/* - - tools/**/* - - vendor/**/* - - Pipfile.lock - include: - ci/environment.yml - ci/prebuild.yml diff --git a/ci/build.yml b/ci/build.yml index 3b5021259..40600bf66 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -8,7 +8,6 @@ variables: core fw regular build: stage: build - extends: .core_job script: - cd core - pipenv run make build_cross @@ -28,7 +27,6 @@ core fw regular build: core fw regular debug build: stage: build - extends: .core_job script: - cd core - PYOPT=0 pipenv run make build_firmware @@ -43,7 +41,6 @@ core fw regular debug build: core fw btconly build: stage: build - extends: .core_job variables: BITCOIN_ONLY: "1" script: @@ -62,7 +59,6 @@ core fw btconly build: core unix regular build: stage: build - extends: .core_job script: - cd core - pipenv run make build_unix @@ -75,7 +71,6 @@ core unix regular build: core unix frozen regular build: stage: build - extends: .core_job script: - cd core - pipenv run make build_unix_frozen @@ -87,7 +82,6 @@ core unix frozen regular build: core unix frozen btconly debug build: stage: build - extends: .core_job variables: PYOPT: "0" BITCOIN_ONLY: "1" @@ -103,7 +97,6 @@ core unix frozen btconly debug build: core unix frozen debug build: stage: build - extends: .core_job variables: PYOPT: "0" script: @@ -158,7 +151,6 @@ crypto build: legacy fw regular build: stage: build - extends: .legacy_job variables: MEMORY_PROTECT: "0" script: @@ -176,7 +168,6 @@ legacy fw regular build: legacy fw debug build: stage: build - extends: .legacy_job variables: DEBUG_LINK: "1" MEMORY_PROTECT: "0" @@ -194,7 +185,6 @@ legacy fw debug build: legacy fw btconly build: stage: build - extends: .legacy_job variables: BITCOIN_ONLY: "1" MEMORY_PROTECT: "0" @@ -214,7 +204,6 @@ legacy fw btconly build: legacy emu regular build: stage: build - extends: .legacy_job variables: DEBUG_LINK: "1" EMULATOR: "1" @@ -229,7 +218,6 @@ legacy emu regular build: legacy emu btconly build: stage: build - extends: .legacy_job variables: BITCOIN_ONLY: "1" DEBUG_LINK: "1" diff --git a/ci/deploy.yml b/ci/deploy.yml index 57ccadc34..7bfc7f16f 100644 --- a/ci/deploy.yml +++ b/ci/deploy.yml @@ -199,7 +199,6 @@ upgrade tests legacy deploy: ui tests core fixtures deploy: stage: deploy - extends: .core_job variables: DEPLOY_PATH: "${DEPLOY_BASE_DIR}/ui_tests/" before_script: [] # no pipenv diff --git a/ci/posttest.yml b/ci/posttest.yml index ba81f4985..c568f1d03 100644 --- a/ci/posttest.yml +++ b/ci/posttest.yml @@ -2,7 +2,6 @@ image: registry.gitlab.com/satoshilabs/trezor/trezor-firmware/environment core unix coverage posttest: stage: posttest - extends: .core_job dependencies: - core device test - core monero test @@ -22,7 +21,6 @@ core unix coverage posttest: core unix ui changes: stage: posttest - extends: .core_job except: - master dependencies: diff --git a/ci/test.yml b/ci/test.yml index aa38512b7..9c6116b0f 100644 --- a/ci/test.yml +++ b/ci/test.yml @@ -4,7 +4,6 @@ image: registry.gitlab.com/satoshilabs/trezor/trezor-firmware/environment core unit test: stage: test - extends: .core_job dependencies: - core unix regular build script: @@ -13,7 +12,6 @@ core unit test: core device ui test: stage: test - extends: .core_job dependencies: - core unix frozen debug build script: @@ -38,7 +36,6 @@ core device ui test: core device test: stage: test - extends: .core_job dependencies: - core unix frozen debug build variables: @@ -60,7 +57,6 @@ core device test: core btconly device test: stage: test - extends: .core_job dependencies: - core unix frozen btconly debug build variables: @@ -81,7 +77,6 @@ core btconly device test: core monero test: stage: test - extends: .core_job dependencies: - core unix frozen debug build variables: @@ -100,7 +95,6 @@ core monero test: core u2f test: stage: test - extends: .core_job dependencies: - core unix frozen debug build variables: @@ -120,7 +114,6 @@ core u2f test: core fido2 test: stage: test - extends: .core_job dependencies: - core unix frozen debug build variables: @@ -142,7 +135,6 @@ core fido2 test: core click test: stage: test - extends: .core_job dependencies: - core unix frozen debug build script: @@ -160,7 +152,6 @@ core click test: core upgrade test: stage: test - extends: .core_job dependencies: - core unix frozen debug build variables: @@ -179,7 +170,6 @@ core upgrade test: core persistence test: stage: test - extends: .core_job dependencies: - core unix frozen debug build script: @@ -225,7 +215,6 @@ crypto test: legacy test: stage: test - extends: .legacy_job dependencies: - legacy emu regular build variables: @@ -244,7 +233,6 @@ legacy test: legacy btconly test: stage: test - extends: .legacy_job dependencies: - legacy emu btconly build variables: @@ -266,7 +254,6 @@ legacy btconly test: legacy upgrade test: stage: test - extends: .legacy_job dependencies: - legacy emu regular build variables: @@ -324,7 +311,6 @@ storage test: # Hardware hardware legacy device test: stage: test - extends: .legacy_job only: - schedules # nightly build - /^legacy\//