From fedc8f71adef0eb33f6697fb16c3c4f023f83617 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Fri, 29 Nov 2019 18:27:35 +0100 Subject: [PATCH 1/3] 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 . From 882034388245b2a852a90ac4d1ffaa5daa37f751 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Fri, 29 Nov 2019 18:28:17 +0100 Subject: [PATCH 2/3] Stash all macOS build artifacts Signed-off-by: Christopher Crone --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b95b7e9e..36dd8d57e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,9 @@ jobs: - run: name: build script command: ./script/build/osx + - store_artifacts: + path: dist/docker-compose-Darwin-x86_64 + destination: docker-compose-Darwin-x86_64 - store_artifacts: path: dist/docker-compose-Darwin-x86_64.tgz destination: docker-compose-Darwin-x86_64.tgz From b7a675b1c047dcf53da0076e074271e2af8e4d00 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Fri, 29 Nov 2019 18:28:47 +0100 Subject: [PATCH 3/3] Upload macOS folder format to bintray Signed-off-by: Christopher Crone --- script/circle/bintray-deploy.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/script/circle/bintray-deploy.sh b/script/circle/bintray-deploy.sh index d508da365..a7cce726e 100755 --- a/script/circle/bintray-deploy.sh +++ b/script/circle/bintray-deploy.sh @@ -25,3 +25,11 @@ curl -f -T dist/docker-compose-${OS_NAME}-x86_64 -u$BINTRAY_USERNAME:$BINTRAY_AP -H "X-Bintray-Package: ${PKG_NAME}" -H "X-Bintray-Version: $CIRCLE_BRANCH" \ -H "X-Bintray-Override: 1" -H "X-Bintray-Publish: 1" -X PUT \ https://api.bintray.com/content/docker-compose/${CIRCLE_BRANCH}/docker-compose-${OS_NAME}-x86_64 || exit 1 + +# Upload folder format of docker-compose for macOS in addition to binary. +if [ "${OS_NAME}" == "Darwin" ]; then + curl -f -T dist/docker-compose-${OS_NAME}-x86_64.tgz -u$BINTRAY_USERNAME:$BINTRAY_API_KEY \ + -H "X-Bintray-Package: ${PKG_NAME}" -H "X-Bintray-Version: $CIRCLE_BRANCH" \ + -H "X-Bintray-Override: 1" -H "X-Bintray-Publish: 1" -X PUT \ + https://api.bintray.com/content/docker-compose/${CIRCLE_BRANCH}/docker-compose-${OS_NAME}-x86_64.tgz || exit 1 +fi