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.
This commit is contained in:
1 parent
a5161b28f5
commit
37bc04f851
2 files changed
+10
-4
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user