From d8bdd800c799cfec75118fcae080bf2e5debb4c3 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 8 Jul 2021 13:41:36 +0200 Subject: [PATCH] GitHub CI [Linux]: run on Ubuntu 18.04 Intel MediaSDK requires at least libva 1.10, U16.04 provides 1.07 only. --- .../{Dockerfile.ubuntu-16.04 => Dockerfile.ubuntu} | 2 +- .github/workflows/ccpp.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) rename .github/scripts/Linux/utils/{Dockerfile.ubuntu-16.04 => Dockerfile.ubuntu} (94%) diff --git a/.github/scripts/Linux/utils/Dockerfile.ubuntu-16.04 b/.github/scripts/Linux/utils/Dockerfile.ubuntu similarity index 94% rename from .github/scripts/Linux/utils/Dockerfile.ubuntu-16.04 rename to .github/scripts/Linux/utils/Dockerfile.ubuntu index b778887c4..ef15b3a15 100644 --- a/.github/scripts/Linux/utils/Dockerfile.ubuntu-16.04 +++ b/.github/scripts/Linux/utils/Dockerfile.ubuntu @@ -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:16.04 +FROM ubuntu:18.04 RUN apt-get update && apt-get install -y libasound2 libegl1-mesa libfontconfig1 libgl1-mesa-glx libglib2.0-0 libgmp10 libharfbuzz0b libjack0 libp11-kit0 libx11-6 diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6f9a77877..58eb214a1 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -67,7 +67,7 @@ jobs: Ubuntu: name: run Ubuntu needs: prepare - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 env: appimage_key: ${{ secrets.appimage_key }} SDK_URL: ${{ secrets.SDK_URL }} @@ -97,19 +97,19 @@ jobs: run: make check - name: make distcheck run: make distcheck - - name: check libstdc++ ABI - run: .github/scripts/Linux/check_abi.sh 2.23 3.4.21 1.3.9 bin/* lib/ultragrid/* + - name: check libc/libstdc++ ABI + run: .github/scripts/Linux/check_abi.sh 2.27 3.4.22 1.3.9 bin/* lib/ultragrid/* - name: Create AppImage run: APPIMAGE=`data/scripts/Linux-AppImage/create-appimage.sh https://github.com/$GITHUB_REPOSITORY/releases/download/$TAG/UltraGrid-$VERSION-x86_64.AppImage.zsync` && mv $APPIMAGE UltraGrid-$VERSION-x86_64.AppImage - name: Check AppImage run: | - docker build -f .github/scripts/Linux/utils/Dockerfile.ubuntu-16.04 -t aitest-ubuntu-16.04 . + docker build -f .github/scripts/Linux/utils/Dockerfile.ubuntu -t aitest-ubuntu . curl -LS -O https://raw.githubusercontent.com/AppImage/pkg2appimage/master/appdir-lint.sh -O https://raw.githubusercontent.com/probonopd/AppImages/master/excludelist sudo apt install desktop-file-utils libfile-mimeinfo-perl # desktop-file-validate, mimetype ./UltraGrid-$VERSION-x86_64.AppImage --appimage-extract - docker run --rm -v $PWD/squashfs-root/:/AppImage aitest-ubuntu-16.04 /AppImage/AppRun -v - docker run --rm -v $PWD/squashfs-root/:/AppImage aitest-ubuntu-16.04 /AppImage/AppRun --tool uv-qt -h - docker run --rm -v $PWD/squashfs-root/:/AppImage aitest-ubuntu-16.04 /AppImage/AppRun --list-modules + docker run --rm -v $PWD/squashfs-root/:/AppImage aitest-ubuntu /AppImage/AppRun -v + docker run --rm -v $PWD/squashfs-root/:/AppImage aitest-ubuntu /AppImage/AppRun --tool uv-qt -h + docker run --rm -v $PWD/squashfs-root/:/AppImage aitest-ubuntu /AppImage/AppRun --list-modules bash appdir-lint.sh squashfs-root - name: Upload NDI Build id: upload-ndi