mirror of
https://github.com/outbackdingo/UltraGrid.git
synced 2026-03-20 06:40:03 +00:00
CI/Linux: Migrate to Ubuntu 20.04
This commit is contained in:
committed by
Martin Pulec
parent
4adb5f6ac0
commit
eb7406f06e
9
.github/scripts/Linux/prepare.sh
vendored
9
.github/scripts/Linux/prepare.sh
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
4
.github/workflows/ccpp.yml
vendored
4
.github/workflows/ccpp.yml
vendored
@@ -51,7 +51,7 @@ jobs:
|
||||
Ubuntu:
|
||||
name: run Ubuntu
|
||||
needs: prepare
|
||||
runs-on: ubuntu-18.04
|
||||
runs-on: ubuntu-20.04
|
||||
env:
|
||||
appimage_key: ${{ secrets.appimage_key }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -122,7 +122,7 @@ jobs:
|
||||
- name: make distcheck
|
||||
run: make distcheck
|
||||
- name: check libc/libstdc++ ABI
|
||||
run: .github/scripts/Linux/check_abi.sh 2.27 3.4.22 1.3.9 bin/* lib/ultragrid/*
|
||||
run: .github/scripts/Linux/check_abi.sh 2.31 3.4.28 1.3.12 bin/* lib/ultragrid/*
|
||||
- name: Create AppImage
|
||||
run: data/scripts/Linux-AppImage/create-appimage.sh https://github.com/$GITHUB_REPOSITORY/releases/download/continuous/UltraGrid-$CHANNEL-x86_64.AppImage.zsync
|
||||
- name: Check AppImage
|
||||
|
||||
Reference in New Issue
Block a user