diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-04-28 15:09:10 +0300 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-04-28 15:21:01 +0300 |
| commit | 9efe4168b78bfb12b8747789d15116da6bd1de78 (patch) | |
| tree | 3104912f0290c308efa7187071c1c40ccffca1cf /.gitlab-ci.yml | |
| parent | 871f91d87f3ce82b6a90fb0717343c9263b0e059 (diff) | |
ci: install dav1d when generating image
Save us from using the static version when building the crate.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc68c8a0f..d95b0a6da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: .debian:10: variables: FDO_DISTRIBUTION_VERSION: 10 - FDO_DISTRIBUTION_TAG: '$RUST_VERSION-${GST_RS_IMG_TAG}_2020-04-27.0' + FDO_DISTRIBUTION_TAG: '$RUST_VERSION-${GST_RS_IMG_TAG}_2020-04-28.0' # Only stuff inside the repo directory can be cached # Override the CARGO_HOME variable to force its location CARGO_HOME: "${CI_PROJECT_DIR}/.cargo_home" @@ -49,6 +49,7 @@ stages: stage: prep variables: FDO_DISTRIBUTION_PACKAGES: "libcsound64-dev llvm clang nasm libsodium-dev" + FDO_DISTRIBUTION_EXEC: 'bash ci/install-dav1d.sh' rules: - if: '$UPDATE_IMG == null' @@ -98,11 +99,6 @@ update-nightly: - "${CARGO_HOME}" variables: SODIUM_USE_PKG_CONFIG: "true" - # The build feature is required for the dav1d plugin for building and - # statically linking the C dav1d library into the dav1d-rs bindings. - # FIXME: The feature name should explicitly mention the dav1d plugin but - # Cargo currently doesn't support passthrough for that scenario. - RUSTFLAGS: "--cfg feature=\"build\"" after_script: - rm -rf target |