From 6136896cc7d9d6cce1f07152f87f96a6308a1588 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 2 Aug 2024 00:28:00 -0600 Subject: [PATCH] Fix linux build (#4) * Update runner to 24.04 as librist is only in 23.10+ * Enable linux build * replace homebrew with linux native packages * Add core depends --------- Co-authored-by: Aaron Honeycutt Co-authored-by: Exeldro --- .github/actions/build-plugin/action.yaml | 16 +++++++++------- .github/workflows/build-project.yaml | 6 +----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/actions/build-plugin/action.yaml b/.github/actions/build-plugin/action.yaml index aeede62..692054c 100644 --- a/.github/actions/build-plugin/action.yaml +++ b/.github/actions/build-plugin/action.yaml @@ -44,13 +44,15 @@ runs: if: runner.os == 'Linux' shell: bash run: | - : Install Dependencies 🛍️ - echo ::group::Install Dependencies - eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH - brew install --quiet zsh - echo ::endgroup:: - + : Install system dependencies 🛍️ + sudo apt install cmake ninja-build pkg-config clang clang-format build-essential curl ccache git zsh + + : Install OBS dependencies 🛍️ + sudo apt install libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libcurl4-openssl-dev libmbedtls-dev libgl1-mesa-dev libjansson-dev libluajit-5.1-dev python3-dev libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev libxcb-composite0-dev libxcomposite-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev swig libcmocka-dev libxss-dev libglvnd-dev libgles2-mesa-dev libwayland-dev librist-dev libsrt-openssl-dev libpci-dev libpipewire-0.3-dev libqrcodegencpp-dev uthash-dev + + : Install OBS Qt6 dependencies 🛍️ + sudo apt install qt6-base-dev qt6-base-private-dev libqt6svg6-dev qt6-wayland qt6-image-formats-plugins + - name: Run Ubuntu Build if: runner.os == 'Linux' shell: zsh --no-rcs --errexit --pipefail {0} diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index fab0656..26bdd63 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -168,9 +168,8 @@ jobs: ubuntu-build: name: Build for Ubuntu 🐧 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: check-event - if: false defaults: run: shell: bash @@ -200,9 +199,6 @@ jobs: restore-keys: | ${{ runner.os }}-ccache-x86_64- - - name: Set up Homebrew 🍺 - uses: Homebrew/actions/setup-homebrew@master - - name: Build Plugin 🧱 uses: ./.github/actions/build-plugin with: