diff options
| author | Janne Grunau <janne-vlc@jannau.net> | 2020-03-03 02:16:34 +0300 |
|---|---|---|
| committer | Janne Grunau <janne-vlc@jannau.net> | 2020-03-03 09:36:11 +0300 |
| commit | abaad816add23cf1db36f79c984e9847f362c35f (patch) | |
| tree | 9f72827bb91c48be3e039cdc09c4ed3cd09da5c4 | |
| parent | 360243c2cafb9c3aef10f129c0c1373ffd708ede (diff) | |
CI/armv7: use `linux32 meson ...` to allow running on aarch64
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 180e262..9a243fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ build-debian-armv7: - armv7 - debian script: - - meson build --buildtype debugoptimized --werror + - linux32 meson build --buildtype debugoptimized --werror - ninja -C build - cd build && meson test -v @@ -230,7 +230,7 @@ build-debian-armv7-clang-5: - armv7 - debian script: - - env CC=clang-5.0 CFLAGS='-integrated-as' meson build --buildtype release + - env CC=clang-5.0 CFLAGS='-integrated-as' linux32 meson build --buildtype release - ninja -C build - cd build && meson test -v @@ -464,7 +464,7 @@ test-debian-armv7-clang-5: - test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master - test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git - git clone cache/dav1d-test-data.git tests/dav1d-test-data - - env CC=clang-5.0 CFLAGS='-integrated-as' meson build --buildtype release + - env CC=clang-5.0 CFLAGS='-integrated-as' linux32 meson build --buildtype release -Dtestdata_tests=true -Dlogging=false - ninja -C build |