CI/Linux: Migrate to Ubuntu 20.04

This commit is contained in:
Martin Piatka
2023-01-17 12:05:02 +01:00
committed by Martin Pulec
parent 4adb5f6ac0
commit eb7406f06e
3 changed files with 3 additions and 12 deletions

View File

@@ -37,20 +37,11 @@ sudo apt install $sdl2_mix_build_dep $sdl2_ttf_build_dep
# FFmpeg deps
sudo add-apt-repository ppa:savoury1/vlc3 # new x265
# updates nasm 2.13->2.14 in U18.04 (needed for rav1e)
update_nasm() {
if [ -z "$(apt-cache search --names-only '^nasm-mozilla$')" ]; then
return
fi
sudo apt install nasm- nasm-mozilla
sudo ln -s /usr/lib/nasm-mozilla/bin/nasm /usr/bin/nasm
}
# for FFmpeg - libzmq3-dev needs to be ignored (cannot be installed, see run #380)
ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'libzmq3-dev\|libsdl2-dev')
# shellcheck disable=SC2086 # intentional
sudo apt install $ffmpeg_build_dep libdav1d-dev libde265-dev
sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev 'libx264*' nginx
update_nasm
# own x264 build
sudo apt --no-install-recommends install asciidoc xmlto
# openVPL

View File

@@ -1,4 +1,4 @@
# inspired by https://github.com/aferrero2707/appimage-testsuite
# installing libraries included in https://raw.githubusercontent.com/probonopd/AppImages/master/excludelist
FROM ubuntu:18.04
FROM ubuntu:20.04
RUN apt-get update && apt-get install -y libasound2 libegl1-mesa libfontconfig1 libgl1-mesa-glx libgmp10 libharfbuzz0b libp11-kit0 libx11-6 xvfb