From 7b9a15efbf8a982e0cda95fafdc42f3c12ca729a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 27 Aug 2018 21:23:00 +0000 Subject: [PATCH] Combine arm and darwin build jobs saves spinning up another container --- .circleci/config.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1c212ab8..af47b602e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,10 +20,7 @@ workflows: - client-test: requires: - client-build - - arm-build: - requires: - - build - - darwin-build: + - xplatform-build: requires: - build - build: @@ -85,16 +82,11 @@ jobs: cd /home/weave; yarn run lint cd /home/weave; yarn test - arm-build: - <<: *defaults - steps: - - checkout - - run: GOARCH=arm make BUILD_IN_CONTAINER=false GO_BUILD_INSTALL_DEPS= prog/scope - - darwin-build: + xplatform-build: <<: *defaults steps: - checkout + - run: GOARCH=arm make BUILD_IN_CONTAINER=false GO_BUILD_INSTALL_DEPS= prog/scope - run: GOOS=darwin make BUILD_IN_CONTAINER=false GO_BUILD_INSTALL_DEPS= prog/scope build: