diff --git a/.travis.yml b/.travis.yml index d762b91..d3924ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,11 @@ jobs: fast_finish: true include: - os: linux + arch: amd64 + dist: bionic + env: TARGET_OS=ubuntu + - os: linux + arch: arm64 dist: bionic env: TARGET_OS=ubuntu - os: osx diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index eddfc30..806aa84 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,11 +1,11 @@ -FROM ubuntu:bionic +FROM --platform=$BUILDPLATFORM ubuntu:bionic LABEL maintainer="Axel Gembe " ARG MAKEFLAGS RUN apt-get update -y && \ apt-get install -y software-properties-common && \ - add-apt-repository ppa:beineri/opt-qt-5.13.2-bionic && \ + add-apt-repository ppa:mainnet-pat/opt-qt-5.13.2-bionic && \ apt-get update -y && \ apt-get install -y qt513base openssl && \ apt-get install -y git build-essential pkg-config zlib1g-dev libbz2-dev libjemalloc-dev libjemalloc1 libzmq3-dev && \ diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh index fc139db..ec82ed2 100755 --- a/contrib/docker/build.sh +++ b/contrib/docker/build.sh @@ -12,4 +12,5 @@ IMAGE_TAG="$1" here=$(dirname $(realpath "$0" 2> /dev/null || grealpath "$0")) . "$here"/../base.sh -docker build --build-arg MAKEFLAGS="-j $WORKER_COUNT" -t "$IMAGE_TAG" -f contrib/docker/Dockerfile "$here"/../.. +docker buildx build --build-arg MAKEFLAGS="-j $WORKER_COUNT" -t "$IMAGE_TAG" -f contrib/docker/Dockerfile \ + --platform linux/arm64/v8,linux/amd64 --push "$here"/../.. diff --git a/contrib/travis/linux.ubuntu.before_install b/contrib/travis/linux.ubuntu.before_install index 4fb99c6..63ae19c 100755 --- a/contrib/travis/linux.ubuntu.before_install +++ b/contrib/travis/linux.ubuntu.before_install @@ -1,3 +1,3 @@ #!/bin/sh -sudo add-apt-repository -y ppa:beineri/opt-qt-5.13.2-bionic +sudo add-apt-repository -y ppa:mainnet-pat/opt-qt-5.13.2-bionic sudo apt-get update -qq diff --git a/staticlibs/rocksdb/bin/linux/aarch64/librocksdb.a b/staticlibs/rocksdb/bin/linux/aarch64/librocksdb.a new file mode 100644 index 0000000..5af935f Binary files /dev/null and b/staticlibs/rocksdb/bin/linux/aarch64/librocksdb.a differ