From fedc8f71adef0eb33f6697fb16c3c4f023f83617 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Fri, 29 Nov 2019 18:27:35 +0100 Subject: [PATCH] Build single binary and folder format for macOS Previously we were overwriting the single binary with the folder format. Signed-off-by: Christopher Crone --- script/build/osx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/script/build/osx b/script/build/osx index bd501ee55..66868756b 100755 --- a/script/build/osx +++ b/script/build/osx @@ -12,11 +12,13 @@ venv/bin/pip install --no-deps . DOCKER_COMPOSE_GITSHA="$(script/build/write-git-sha)" echo "${DOCKER_COMPOSE_GITSHA}" > compose/GITSHA +# Build as a folder for macOS Catalina. +venv/bin/pyinstaller docker-compose_darwin.spec +dist/docker-compose-Darwin-x86_64/docker-compose version +(cd dist/docker-compose-Darwin-x86_64/ && tar zcvf ../docker-compose-Darwin-x86_64.tgz .) +rm -rf dist/docker-compose-Darwin-x86_64 + +# Build static binary for legacy. venv/bin/pyinstaller docker-compose.spec mv dist/docker-compose dist/docker-compose-Darwin-x86_64 dist/docker-compose-Darwin-x86_64 version - -# Also build as a folder, required on osx Catalina -venv/bin/pyinstaller docker-compose_darwin.spec -dist/docker-compose-Darwin-x86_64/docker-compose version -cd dist/docker-compose-Darwin-x86_64/ && tar zcvf ../docker-compose-Darwin-x86_64.tgz .