From 00593dc6d6e6fc1252d5ab71571fafef37deed4f Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Sun, 23 Aug 2020 20:06:50 +0200 Subject: [PATCH] ci: fix builds for MacOS Drop .app bundling and use a simpler approach. A simple .command bash script is present that launches the binary. --- ci/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 4065a8af5..022993e4b 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -115,23 +115,23 @@ core unix frozen debug build: untracked: true expire_in: 1 week -core unix frozen regular darwin: +core macos frozen regular build: stage: build needs: [] tags: - darwin - when: manual script: - 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/trezor-emu-core TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/MacOS/TrezorEmu-$CI_COMMIT_SHORT_SHA - - dylibbundler -of -b -i /usr/lib/system -d TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/libs -x TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/MacOS/TrezorEmu-$CI_COMMIT_SHORT_SHA - - mv TrezorEmu-$CI_COMMIT_SHORT_SHA.app trezor-emu-regular-macos-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.app - allow_failure: true + - export NAME="trezor-emu-core.darwin" + - cp -v core/build/unix/trezor-emu-core ./$NAME + - chmod +x $NAME + - echo '"$(dirname "$BASH_SOURCE")"/trezor-emu-core.darwin' > trezor-emulator.command + - chmod u+x trezor-emulator.command artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA" paths: - - trezor-emu-regular-macos-$CORE_VERSION-$CI_COMMIT_SHORT_SHA.app + - trezor-emu-core.darwin + - trezor-emulator.command expire_in: 1 week # Crypto