From 4159cdcebd26edefd7b9a6ce43a5adb1ba982bd4 Mon Sep 17 00:00:00 2001 From: odrling <florianbadie@odrling.xyz> Date: Tue, 10 Dec 2019 22:23:13 +0100 Subject: [PATCH] [ci] fix debian bionic build --- .ci/distribution/debian/rules | 2 -- .ci/docker/bionic/Dockerfile | 16 +++++++++------- .ci/docker/debian_entrypoint.sh | 2 -- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.ci/distribution/debian/rules b/.ci/distribution/debian/rules index a66a86d67..e57ba5a36 100755 --- a/.ci/distribution/debian/rules +++ b/.ci/distribution/debian/rules @@ -9,5 +9,3 @@ export DEB_BUILD_OPTIONS=nocheck # tests are broken %: dh $@ -override_dh_auto_configure: - dh_auto_configure -- --without-oss --without-portaudio --without-openal --disable-update-checker diff --git a/.ci/docker/bionic/Dockerfile b/.ci/docker/bionic/Dockerfile index 857d2686d..9f90537a5 100644 --- a/.ci/docker/bionic/Dockerfile +++ b/.ci/docker/bionic/Dockerfile @@ -1,15 +1,17 @@ FROM ubuntu:bionic -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y dh-make build-essential libwxgtk3.0 libboost-all-dev icu-devtools libffms2-dev fontconfig libfreetype6-dev libass-dev zlib1g-dev libgl1 libssl-dev libasound2-dev libpulse-dev fftw3-dev libuchardet-dev libc6-dev intltool libhunspell-dev git +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get upgrade -y && apt-get install -y dh-make build-essential libwxgtk3.0 libboost-all-dev icu-devtools libffms2-dev fontconfig libfreetype6-dev libass-dev zlib1g-dev libgl1 libssl-dev libasound2-dev libpulse-dev fftw3-dev libuchardet-dev libc6-dev intltool libhunspell-dev git python3-pip libreadline-dev ninja-build +RUN pip3 install meson COPY . /aegisub WORKDIR /aegisub -RUN make clean -RUN build/version.sh . -RUN rm -rf .git -RUN mv .ci/docker/debian_entrypoint.sh /entrypoint.sh -RUN mv .ci/distribution/debian /aegisub +RUN rm -rf builddir +RUN meson -Dprefix=/usr builddir +WORKDIR builddir +RUN mv ../.ci/docker/debian_entrypoint.sh /entrypoint.sh +RUN mv ../.ci/distribution/ubuntu-bionic debian RUN chmod +x /entrypoint.sh CMD ["/entrypoint.sh"] diff --git a/.ci/docker/debian_entrypoint.sh b/.ci/docker/debian_entrypoint.sh index 613afbea8..2a164e0bb 100755 --- a/.ci/docker/debian_entrypoint.sh +++ b/.ci/docker/debian_entrypoint.sh @@ -1,7 +1,5 @@ #!/bin/sh -e -export MAKEFLAGS="-j$(nproc)" -cd /aegisub dpkg-buildpackage -nc mv ../*.deb /out/ -- GitLab