Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit37a96da

Browse files
committed
add arm64 matrix entries and update Dockerfile
1 parent16ac6e7 commit37a96da

File tree

2 files changed

+225
-10
lines changed

2 files changed

+225
-10
lines changed

‎.travis.yml‎

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,21 @@ jobs:
295295
-USE_CCACHE=0
296296
cache:
297297
directories:$HOME/.ccache
298+
-os:linux
299+
arch:arm64
300+
language:generic
301+
dist:xenial
302+
services:docker
303+
env:
304+
-MB_PYTHON_VERSION=3.6
305+
-PLAT=aarch64
306+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
307+
-ENABLE_CONTRIB=0
308+
-ENABLE_HEADLESS=0
309+
-TEST_DEPENDS=numpy==1.19.0
310+
-USE_CCACHE=0
311+
cache:
312+
directories:$HOME/.ccache
298313
-os:linux
299314
language:generic
300315
dist:xenial
@@ -319,6 +334,21 @@ jobs:
319334
-USE_CCACHE=0
320335
cache:
321336
directories:$HOME/.ccache
337+
-os:linux
338+
arch:arm64
339+
language:generic
340+
dist:xenial
341+
services:docker
342+
env:
343+
-MB_PYTHON_VERSION=3.7
344+
-PLAT=aarch64
345+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
346+
-ENABLE_CONTRIB=0
347+
-ENABLE_HEADLESS=0
348+
-TEST_DEPENDS=numpy==1.19.0
349+
-USE_CCACHE=0
350+
cache:
351+
directories:$HOME/.ccache
322352
-os:linux
323353
language:generic
324354
dist:xenial
@@ -343,6 +373,21 @@ jobs:
343373
-USE_CCACHE=0
344374
cache:
345375
directories:$HOME/.ccache
376+
-os:linux
377+
arch:arm64
378+
language:generic
379+
dist:xenial
380+
services:docker
381+
env:
382+
-MB_PYTHON_VERSION=3.8
383+
-PLAT=aarch64
384+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
385+
-ENABLE_CONTRIB=0
386+
-ENABLE_HEADLESS=0
387+
-TEST_DEPENDS=numpy==1.19.0
388+
-USE_CCACHE=0
389+
cache:
390+
directories:$HOME/.ccache
346391
-os:linux
347392
language:generic
348393
dist:xenial
@@ -408,6 +453,21 @@ jobs:
408453
-USE_CCACHE=0
409454
cache:
410455
directories:$HOME/.ccache
456+
-os:linux
457+
arch:arm64
458+
language:generic
459+
dist:xenial
460+
services:docker
461+
env:
462+
-MB_PYTHON_VERSION=3.6
463+
-PLAT=aarch64
464+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
465+
-ENABLE_CONTRIB=0
466+
-ENABLE_HEADLESS=1
467+
-TEST_DEPENDS=numpy==1.19.0
468+
-USE_CCACHE=0
469+
cache:
470+
directories:$HOME/.ccache
411471
-os:linux
412472
language:generic
413473
dist:xenial
@@ -432,6 +492,21 @@ jobs:
432492
-USE_CCACHE=0
433493
cache:
434494
directories:$HOME/.ccache
495+
-os:linux
496+
arch:arm64
497+
language:generic
498+
dist:xenial
499+
services:docker
500+
env:
501+
-MB_PYTHON_VERSION=3.7
502+
-PLAT=aarch64
503+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
504+
-ENABLE_CONTRIB=0
505+
-ENABLE_HEADLESS=1
506+
-TEST_DEPENDS=numpy==1.19.0
507+
-USE_CCACHE=0
508+
cache:
509+
directories:$HOME/.ccache
435510
-os:linux
436511
language:generic
437512
dist:xenial
@@ -456,6 +531,21 @@ jobs:
456531
-USE_CCACHE=0
457532
cache:
458533
directories:$HOME/.ccache
534+
-os:linux
535+
arch:arm64
536+
language:generic
537+
dist:xenial
538+
services:docker
539+
env:
540+
-MB_PYTHON_VERSION=3.8
541+
-PLAT=aarch64
542+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
543+
-ENABLE_CONTRIB=0
544+
-ENABLE_HEADLESS=1
545+
-TEST_DEPENDS=numpy==1.19.0
546+
-USE_CCACHE=0
547+
cache:
548+
directories:$HOME/.ccache
459549
-os:linux
460550
language:generic
461551
dist:xenial
@@ -480,6 +570,21 @@ jobs:
480570
-USE_CCACHE=0
481571
cache:
482572
directories:$HOME/.ccache
573+
-os:linux
574+
arch:arm64
575+
language:generic
576+
dist:xenial
577+
services:docker
578+
env:
579+
-MB_PYTHON_VERSION=3.9
580+
-PLAT=aarch64
581+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
582+
-ENABLE_CONTRIB=0
583+
-ENABLE_HEADLESS=1
584+
-TEST_DEPENDS=numpy==1.19.0
585+
-USE_CCACHE=0
586+
cache:
587+
directories:$HOME/.ccache
483588

484589
# contrib builds for Linux
485590
-os:linux
@@ -506,6 +611,21 @@ jobs:
506611
-USE_CCACHE=0
507612
cache:
508613
directories:$HOME/.ccache
614+
-os:linux
615+
arch:arm64
616+
language:generic
617+
dist:xenial
618+
services:docker
619+
env:
620+
-MB_PYTHON_VERSION=3.6
621+
-PLAT=aarch64
622+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
623+
-ENABLE_CONTRIB=1
624+
-ENABLE_HEADLESS=0
625+
-TEST_DEPENDS=numpy==1.19.0
626+
-USE_CCACHE=0
627+
cache:
628+
directories:$HOME/.ccache
509629
-os:linux
510630
language:generic
511631
dist:xenial
@@ -530,6 +650,21 @@ jobs:
530650
-USE_CCACHE=0
531651
cache:
532652
directories:$HOME/.ccache
653+
-os:linux
654+
arch:arm64
655+
language:generic
656+
dist:xenial
657+
services:docker
658+
env:
659+
-MB_PYTHON_VERSION=3.7
660+
-PLAT=aarch64
661+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
662+
-ENABLE_CONTRIB=1
663+
-ENABLE_HEADLESS=0
664+
-TEST_DEPENDS=numpy==1.19.0
665+
-USE_CCACHE=0
666+
cache:
667+
directories:$HOME/.ccache
533668
-os:linux
534669
language:generic
535670
dist:xenial
@@ -554,6 +689,21 @@ jobs:
554689
-USE_CCACHE=0
555690
cache:
556691
directories:$HOME/.ccache
692+
-os:linux
693+
arch:arm64
694+
language:generic
695+
dist:xenial
696+
services:docker
697+
env:
698+
-MB_PYTHON_VERSION=3.8
699+
-PLAT=aarch64
700+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
701+
-ENABLE_CONTRIB=1
702+
-ENABLE_HEADLESS=0
703+
-TEST_DEPENDS=numpy==1.19.0
704+
-USE_CCACHE=0
705+
cache:
706+
directories:$HOME/.ccache
557707
-os:linux
558708
language:generic
559709
dist:xenial
@@ -578,6 +728,21 @@ jobs:
578728
-USE_CCACHE=0
579729
cache:
580730
directories:$HOME/.ccache
731+
-os:linux
732+
arch:arm64
733+
language:generic
734+
dist:xenial
735+
services:docker
736+
env:
737+
-MB_PYTHON_VERSION=3.9
738+
-PLAT=aarch64
739+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
740+
-ENABLE_CONTRIB=1
741+
-ENABLE_HEADLESS=0
742+
-TEST_DEPENDS=numpy==1.19.0
743+
-USE_CCACHE=0
744+
cache:
745+
directories:$HOME/.ccache
581746

582747

583748
# headless contrib builds for Linux
@@ -605,6 +770,21 @@ jobs:
605770
-USE_CCACHE=0
606771
cache:
607772
directories:$HOME/.ccache
773+
-os:linux
774+
arch:arm64
775+
language:generic
776+
dist:xenial
777+
services:docker
778+
env:
779+
-MB_PYTHON_VERSION=3.6
780+
-PLAT=aarch64
781+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
782+
-ENABLE_CONTRIB=1
783+
-ENABLE_HEADLESS=1
784+
-TEST_DEPENDS=numpy==1.19.0
785+
-USE_CCACHE=0
786+
cache:
787+
directories:$HOME/.ccache
608788
-os:linux
609789
language:generic
610790
dist:xenial
@@ -629,6 +809,21 @@ jobs:
629809
-USE_CCACHE=0
630810
cache:
631811
directories:$HOME/.ccache
812+
-os:linux
813+
arch:arm64
814+
language:generic
815+
dist:xenial
816+
services:docker
817+
env:
818+
-MB_PYTHON_VERSION=3.7
819+
-PLAT=aarch64
820+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
821+
-ENABLE_CONTRIB=1
822+
-ENABLE_HEADLESS=1
823+
-TEST_DEPENDS=numpy==1.19.0
824+
-USE_CCACHE=0
825+
cache:
826+
directories:$HOME/.ccache
632827
-os:linux
633828
language:generic
634829
dist:xenial
@@ -653,6 +848,21 @@ jobs:
653848
-USE_CCACHE=0
654849
cache:
655850
directories:$HOME/.ccache
851+
-os:linux
852+
arch:arm64
853+
language:generic
854+
dist:xenial
855+
services:docker
856+
env:
857+
-MB_PYTHON_VERSION=3.8
858+
-PLAT=aarch64
859+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
860+
-ENABLE_CONTRIB=1
861+
-ENABLE_HEADLESS=1
862+
-TEST_DEPENDS=numpy==1.19.0
863+
-USE_CCACHE=0
864+
cache:
865+
directories:$HOME/.ccache
656866
-os:linux
657867
language:generic
658868
dist:xenial
@@ -677,6 +887,21 @@ jobs:
677887
-USE_CCACHE=0
678888
cache:
679889
directories:$HOME/.ccache
890+
-os:linux
891+
arch:arm64
892+
language:generic
893+
dist:xenial
894+
services:docker
895+
env:
896+
-MB_PYTHON_VERSION=3.9
897+
-PLAT=aarch64
898+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
899+
-ENABLE_CONTRIB=1
900+
-ENABLE_HEADLESS=1
901+
-TEST_DEPENDS=numpy==1.19.0
902+
-USE_CCACHE=0
903+
cache:
904+
directories:$HOME/.ccache
680905

681906
# The first line is printed in the folding header in Travis output
682907
before_install:|

‎docker/manylinux2014/Dockerfile_aarch64‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,6 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache-
6868
make -j$(getconf _NPROCESSORS_ONLN) && \
6969
make install
7070

71-
RUN curl -O -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0.tar.gz && \
72-
tar -xf cmake-3.17.0.tar.gz && \
73-
cd cmake-3.17.0 && \
74-
export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
75-
./configure --system-curl && \
76-
make && \
77-
make install && \
78-
cd .. && \
79-
rm -rf cmake-3.17.0*
80-
8171
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
8272
ENV LDFLAGS -L/root/ffmpeg_build/lib
8373
ENV PATH "$HOME/bin:$PATH"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp