From 82c0c403677a14bde56c1a6b440a46593a57267d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 3 Jul 2020 21:52:47 +0200 Subject: [PATCH] ci: make nix-shell available on darwin in before_script --- .gitlab-ci.yml | 1 + ci/build.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8a22df8d..4a985d6db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,7 @@ stages: - deploy before_script: + - . $HOME/.nix-profile/etc/profile.d/nix.sh || true - nix-shell --run "pipenv sync" include: diff --git a/ci/build.yml b/ci/build.yml index 645fe0491..f7c4890ef 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -103,7 +103,6 @@ core unix frozen regular darwin: - darwin when: manual script: - - . $HOME/.nix-profile/etc/profile.d/nix.sh - nix-shell --run "pipenv run make -C core build_unix_frozen" - mkdir -p TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/{MacOS,libs} - cp -v core/build/unix/micropython TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/MacOS/TrezorEmu-$CI_COMMIT_SHORT_SHA