File tree Expand file tree Collapse file tree 3 files changed +11
-10
lines changed
Expand file tree Collapse file tree 3 files changed +11
-10
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,14 @@ sudo apt install uuid-dev # Cineform
4444 sudo apt install gcc-10 g++-10
4545 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
4646 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
47+
48+ # FFmpeg deps
49+ for i in $( seq 10) ; do
50+ [ " $i " -gt 1 ] && sleep $(( 2 ** i))
51+ # openh264, new x265
52+ sudo add-apt-repository --yes ppa:savoury1/ffmpeg4 && err=0 && break || err=$?
53+ done
54+ (exit " $err " )
4755)
4856
4957get_build_deps_excl () { # $2 - pattern to exclude; separate packates with '\|' (BRE alternation)
@@ -55,13 +63,6 @@ sdl2_ttf_build_dep=$(get_build_deps_excl libsdl2-ttf libsdl2-dev)
5563# shellcheck disable=SC2086 # intentional
5664sudo apt install $sdl2_mix_build_dep $sdl2_ttf_build_dep
5765
58- # FFmpeg deps
59- for i in $( seq 10) ; do
60- [ " $i " -gt 1 ] && sleep $(( 2 ** i))
61- # openh264, new x265
62- sudo add-apt-repository --yes ppa:savoury1/ffmpeg4 && err=0 && break || err=$?
63- done
64- (exit " $err " )
6566# for FFmpeg - libzmq3-dev needs to be ignored (cannot be installed, see run #380)
6667ffmpeg_build_dep=$( get_build_deps_excl ffmpeg ' libva-dev' )
6768# shellcheck disable=SC2086 # intentional
Original file line number Diff line number Diff line change 11# inspired by https://github.com/aferrero2707/appimage-testsuite
22# installing libraries included in https://raw.githubusercontent.com/probonopd/AppImages/master/excludelist
3- FROM ubuntu:20 .04
3+ FROM ubuntu:22 .04
44RUN apt-get update && apt-get install -y libasound2 libegl1-mesa libfontconfig1 libgl1-mesa-glx libgmp10 libharfbuzz0b libp11-kit0 libx11-6 xvfb
Original file line number Diff line number Diff line change 5151 Ubuntu :
5252 name : run Ubuntu
5353 needs : prepare
54- runs-on : ubuntu-20 .04
54+ runs-on : ubuntu-22 .04
5555 env :
5656 appimage_key : ${{ secrets.appimage_key }}
5757 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
9797 - name : make distcheck
9898 run : make distcheck
9999 - name : check libc/libstdc++ ABI
100- run : .github/scripts/Linux/check_abi.sh 2.31 3.4.28 1.3.12 bin/* lib/ultragrid/*
100+ run : .github/scripts/Linux/check_abi.sh 2.35 3.4.30 1.3.13 bin/* lib/ultragrid/*
101101 - name : Create AppImage
102102 run : data/scripts/Linux-AppImage/create-appimage.sh https://github.com/$GITHUB_REPOSITORY/releases/download/continuous/UltraGrid-$CHANNEL-x86_64.AppImage.zsync
103103 - name : Check AppImage
You can’t perform that action at this time.
0 commit comments