actions: reapply previous patch, with fixes. Back using Ubuntu 22 LTS…

… again.
sadok · Feb 7, 2023 · a85e29b · a85e29b
1 parent fbd047c
commit a85e29b
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -9,7 +9,7 @@ concurrency:
 jobs:
   build:
     name: Build on Ubuntu
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v3
@@ -20,13 +20,29 @@ jobs:
         sudo apt-get install autoconf automake build-essential libass-dev libbz2-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev libjansson-dev liblzma-dev libmp3lame-dev libnuma-dev libturbojpeg0-dev libssl-dev
         sudo apt-get install libogg-dev libopus-dev libsamplerate-dev libspeex-dev libtheora-dev libtool libtool-bin libvorbis-dev libx264-dev libxml2-dev libvpx-dev make nasm ninja-build patch tar yasm zlib1g-dev appstream
         sudo pip3 install meson
-        sudo apt-get install gstreamer1.0-libav intltool libappindicator-dev libdbus-glib-1-dev libglib2.0-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgtk-3-dev libgudev-1.0-dev libnotify-dev
-        sudo apt-get install libva-dev libdrm-dev
+        sudo apt-get install gstreamer1.0-libav intltool libappindicator-dev libdbus-glib-1-dev libglib2.0-dev libgtk-3-dev libgudev-1.0-dev libnotify-dev
+        sudo apt-get install libva-dev libdrm-dev llvm clang
         curl https://sh.rustup.rs -sSf | sh -s -- -y
         source "$HOME/.cargo/env"
         rustup target add x86_64-pc-windows-gnu
         cargo install cargo-c
 
+    - name: Setup Toolchain
+      run: |
+        wget https://github.com/HandBrake/HandBrake-toolchains/releases/download/1.0/cmake-3.16.3-Linux-x86_64.tar.gz
+        SHA=$(sha1sum cmake-3.16.3-Linux-x86_64.tar.gz)
+        EXPECTED="a0f48057d8ccb6d4e50e80c77796466315dd2bfb  cmake-3.16.3-Linux-x86_64.tar.gz"
+        if [ "$SHA" == "$EXPECTED" ];
+        then
+            echo "Extracting CMake"
+            tar xvf cmake-3.16.3-Linux-x86_64.tar.gz
+        else
+            echo "Toolchain Verification FAILED. Exiting!"
+            return -1
+        fi
+
     - name: Build HandBrake Linux
       run: |
-        ./configure --disable-gtk-update-checks --enable-qsv --enable-vce --enable-nvenc --enable-libdovi --enable-nvdec --launch-jobs=0 --launch
+         PWD=$(pwd)
+         export PATH=$PWD/cmake-3.16.3-Linux-x86_64/bin:$PATH
+         ./configure --disable-gtk-update-checks --enable-qsv --enable-vce --enable-nvenc --enable-libdovi --enable-nvdec --launch-jobs=0 --launch