From 040b4a1ee71de11d8c4de1bf281b7efbec2baab0 Mon Sep 17 00:00:00 2001
From: Tomas Susanka <tsusanka@gmail.com>
Date: Sun, 5 Jul 2020 21:38:19 +0200
Subject: [PATCH] ci: fix VERSION export from version.h

---
 ci/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/build.yml b/ci/build.yml
index f7c4890efc..dd66a3b6f9 100644
--- a/ci/build.yml
+++ b/ci/build.yml
@@ -15,7 +15,7 @@ core fw regular build:
     - nix-shell --run "pipenv run make -C core build_prodtest"
     - nix-shell --run "pipenv run make -C core build_firmware"
     - nix-shell --run "pipenv run make -C core sizecheck"
-    - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
+    - export VERSION=$(nix-shell --run "./tools/version.sh core/embed/firmware/version.h")
     - cp core/build/firmware/firmware.bin trezor-fw-regular-$VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -27,7 +27,7 @@ core fw regular debug build:
   stage: build
   script:
     - nix-shell --run "PYOPT=0 pipenv run make -C core build_firmware"
-    - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
+    - export VERSION=$(nix-shell --run "./tools/version.sh core/embed/firmware/version.h")
     - cp core/build/firmware/firmware.bin trezor-fw-regular-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -43,7 +43,7 @@ core fw btconly build:
     - nix-shell --run "pipenv run make -C core build_firmware"
     - mv core/build/firmware/firmware.bin core/build/firmware/firmware-bitcoinonly.bin
     - nix-shell --run "pipenv run ./tools/check-bitcoin-only core/build/firmware/firmware-bitcoinonly.bin"
-    - export VERSION=$(./tools/version.sh core/embed/firmware/version.h)
+    - export VERSION=$(nix-shell --run "./tools/version.sh core/embed/firmware/version.h")
     - cp core/build/firmware/firmware-bitcoinonly.bin trezor-fw-btconly-$VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -144,7 +144,7 @@ legacy fw regular build:
   script:
     - nix-shell --run "pipenv run legacy/script/cibuild"
     - nix-shell --run "pipenv run make -C legacy/demo"
-    - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
+    - export VERSION=$(nix-shell --run "./tools/version.sh legacy/firmware/version.h")
     - mv legacy/firmware/trezor.bin trezor-fw-regular-$VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -159,7 +159,7 @@ legacy fw debug build:
     MEMORY_PROTECT: "0"
   script:
     - nix-shell --run "pipenv run legacy/script/cibuild"
-    - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
+    - export VERSION=$(nix-shell --run "./tools/version.sh legacy/firmware/version.h")
     - mv legacy/firmware/trezor.bin trezor-fw-regular-debug-$VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
@@ -176,7 +176,7 @@ legacy fw btconly build:
     - nix-shell --run "pipenv run legacy/script/cibuild"
     - mv legacy/firmware/trezor.bin legacy/firmware/trezor-bitcoinonly.bin
     - nix-shell --run "pipenv run ./tools/check-bitcoin-only legacy/firmware/trezor-bitcoinonly.bin"
-    - export VERSION=$(./tools/version.sh legacy/firmware/version.h)
+    - export VERSION=$(nix-shell --run "./tools/version.sh legacy/firmware/version.h")
     - mv legacy/firmware/trezor-bitcoinonly.bin trezor-fw-btconly-$VERSION-$CI_COMMIT_SHORT_SHA.bin
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"