From 37bc04f85155ee253f6e515bc08d5fd6c1db3a16 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 1 Nov 2018 12:24:17 +0000 Subject: [PATCH] Fix master deploy step: run newer manifest-tool and build all architectures The version of manifest-tool in `weshigbee/manifest-tool` is version 0.3.0 and is erroring on every build; latest is 0.8.0 and doesn't error. Since we are no longer limited to what will run in a container at CircleCI, also build all architectures. --- .circleci/config.yml | 10 ++++++++-- Makefile | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a796215..e20dfe05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,9 +89,15 @@ jobs: steps: - checkout - setup_remote_docker - # Rebuild without coverage and push to dockerhub + # Register qemu hooks, rebuild without coverage and push to dockerhub - deploy: - command: bin/circle-deploy-master + command: | + docker login -u $DOCKER_USER -p $DOCKER_PASS + docker run --rm --privileged multiarch/qemu-user-static:register --reset + wget https://github.com/estesp/manifest-tool/releases/download/v0.8.0/manifest-tool-linux-amd64 + chmod +x manifest-tool-linux-amd64 + make clean-bin + make publish MANIFEST_TOOL_CMD=./manifest-tool-linux-amd64 UPDATE_LATEST=latest-only SUDO= BUILD_IN_CONTAINER=false workflows: version: 2 diff --git a/Makefile b/Makefile index 6351d359..53c82673 100644 --- a/Makefile +++ b/Makefile @@ -116,8 +116,8 @@ WEAVEWAIT_NOOP_EXE=prog/weavewait/weavewait_noop WEAVEWAIT_NOMCAST_EXE=prog/weavewait/weavewait_nomcast WEAVEUTIL_EXE=prog/weaveutil/weaveutil RUNNER_EXE=tools/runner/runner -# manifest-tool needs registry credentials; we assume here that the active user has logged in -MANIFEST_TOOL_CMD=docker run --rm -v $(HOME)/.docker:/.docker weshigbee/manifest-tool --docker-cfg=/.docker +# Get this from https://github.com/estesp/manifest-tool/releases +MANIFEST_TOOL_CMD=manifest-tool TEST_TLS_EXE=test/tls/tls NETWORKTESTER_EXE=test/images/network-tester/webserver