Merge pull request #5609 from docker/xcode_7

Trigger remote build for OSX 10.11
This commit is contained in:
Joffrey F 2018-01-25 18:06:14 -08:00 committed by GitHub
commit 234e8d5d05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,10 +32,10 @@ jobs:
- store_artifacts: - store_artifacts:
path: dist/docker-compose-Darwin-x86_64 path: dist/docker-compose-Darwin-x86_64
destination: docker-compose-Darwin-x86_64 destination: docker-compose-Darwin-x86_64
- deploy: # - deploy:
name: Deploy binary to bintray # name: Deploy binary to bintray
command: | # command: |
OS_NAME=Darwin PKG_NAME=osx ./script/circle/bintray-deploy.sh # OS_NAME=Darwin PKG_NAME=osx ./script/circle/bintray-deploy.sh
build-linux-binary: build-linux-binary:
@ -53,6 +53,30 @@ jobs:
name: Deploy binary to bintray name: Deploy binary to bintray
command: | command: |
OS_NAME=Linux PKG_NAME=linux ./script/circle/bintray-deploy.sh OS_NAME=Linux PKG_NAME=linux ./script/circle/bintray-deploy.sh
trigger-osx-binary-deploy:
# We use a separate repo to build OSX binaries meant for distribution
# with support for OSSX 10.11 (xcode 7). This job triggers a build on
# that repo.
docker:
- image: alpine:3.6
steps:
- run:
name: install curl
command: apk update && apk add curl
- run:
name: API trigger
command: |
curl -X POST -H "Content-Type: application/json" \
-u ${OSX_RELEASE_TOKEN} -d "{\
\"build_parameters\": {\
\"COMPOSE_BRANCH\": \"${CIRCLE_BRANCH}\"\
}\
}" https://circleci.com/api/v1.1/project/github/docker/compose-osx-release
workflows: workflows:
version: 2 version: 2
all: all:
@ -60,3 +84,9 @@ workflows:
- test - test
- build-linux-binary - build-linux-binary
- build-osx-binary - build-osx-binary
- trigger-osx-binary-deploy:
filters:
branches:
only:
- master
- /bump-.*/