From 37a96dac620aa72751936560f430756a1a099451 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Heinisuo Date: Mon, 16 Nov 2020 16:48:00 +0200 Subject: [PATCH] add arm64 matrix entries and update Dockerfile --- .travis.yml | 225 ++++++++++++++++++++++++ docker/manylinux2014/Dockerfile_aarch64 | 10 -- 2 files changed, 225 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c1c0b8..30a0ff0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -295,6 +295,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -319,6 +334,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -343,6 +373,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.8 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -408,6 +453,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -432,6 +492,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -456,6 +531,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.8 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -480,6 +570,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=0 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache # contrib builds for Linux - os: linux @@ -506,6 +611,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -530,6 +650,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -554,6 +689,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.8 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -578,6 +728,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=0 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache # headless contrib builds for Linux @@ -605,6 +770,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -629,6 +809,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -653,6 +848,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.8 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache - os: linux language: generic dist: xenial @@ -677,6 +887,21 @@ jobs: - USE_CCACHE=0 cache: directories: $HOME/.ccache + - os: linux + arch: arm64 + language: generic + dist: xenial + services: docker + env: + - MB_PYTHON_VERSION=3.9 + - PLAT=aarch64 + - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 + - ENABLE_CONTRIB=1 + - ENABLE_HEADLESS=1 + - TEST_DEPENDS=numpy==1.19.0 + - USE_CCACHE=0 + cache: + directories: $HOME/.ccache # The first line is printed in the folding header in Travis output before_install: | diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64 index 5fb4726..e892077 100644 --- a/docker/manylinux2014/Dockerfile_aarch64 +++ b/docker/manylinux2014/Dockerfile_aarch64 @@ -68,16 +68,6 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache- make -j$(getconf _NPROCESSORS_ONLN) && \ make install -RUN curl -O -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0.tar.gz && \ - tar -xf cmake-3.17.0.tar.gz && \ - cd cmake-3.17.0 && \ - export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \ - ./configure --system-curl && \ - make && \ - make install && \ - cd .. && \ - rm -rf cmake-3.17.0* - ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig ENV LDFLAGS -L/root/ffmpeg_build/lib ENV PATH "$HOME/bin:$PATH" -- GitLab