提交 37a96dac 编写于 作者: O Olli-Pekka Heinisuo

add arm64 matrix entries and update Dockerfile

上级 16ac6e76
......@@ -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: |
......
......@@ -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"
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册