Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ffaerber committed Nov 21, 2017
1 parent 50f452e commit 22af1bf
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ services:

env:
matrix:
- ARCH=amd64
# - ARCH=amd64
- ARCH=arm32v7

script:
- ./travis-build.sh
- >
if [ -n "$TRAVIS_TAG" ]; then
travis_retry timeout 5m docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
./travis-deploy.sh
fi
# - >
# if [ -n "$TRAVIS_TAG" ]; then
# travis_retry timeout 5m docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
# ./travis-deploy.sh
# fi
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ARG ARCH=amd64
FROM ${ARCH}/debian:stretch-slim

COPY qemu-arm-static /usr/bin/qemu-arm-static

RUN apt-get update && \
apt-get install -y \
vim \
Expand Down
13 changes: 9 additions & 4 deletions travis-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ if [ "$ARCH" != "amd64" ]; then
# prepare qemu
docker run --rm --privileged multiarch/qemu-user-static:register --reset

if [ "$ARCH" == "arm64" ]; then
# prepare qemu binary
docker create --name register hypriot/qemu-register
docker cp register:qemu-aarch64 qemu-aarch64-static
docker create --name qemu-register hypriot/qemu-register

if [ "$ARCH" == "arm64v8" ]; then
docker cp qemu-register:qemu-aarch64 qemu-aarch64-static
fi

if [ "$ARCH" == "arm32v7" ]; then
docker cp qemu-register:qemu-arm qemu-arm-static
fi

fi

if [ -d tmp ]; then
Expand Down

0 comments on commit 22af1bf

Please sign in to comment.