Update CI/CD to use Ubuntu 24.04 and distro FFmpeg 6.x

This commit is contained in:
2026-05-29 00:50:02 +08:00
parent 5c40a3376f
commit a3724d3ec9
4 changed files with 16 additions and 42 deletions
+13 -18
View File
@@ -132,31 +132,26 @@ jobs:
path: Oak-Video-Editor-macOS.dmg
# ------------------------------------------------------------------
# Linux AppImage (Arch Linux — latest FFmpeg)
# Linux AppImage (Ubuntu 24.04 — distro FFmpeg 6.x)
# ------------------------------------------------------------------
appimage:
runs-on: ubuntu-latest
container:
image: archlinux:latest
runs-on: ubuntu-24.04
steps:
- name: Initialize pacman
run: |
pacman-key --init
pacman-key --populate archlinux
pacman -Sy --noconfirm archlinux-keyring
- name: Install dependencies
run: |
pacman -Syu --noconfirm \
base-devel cmake ninja git wget fuse2 desktop-file-utils \
qt6-base qt6-tools \
ffmpeg openimageio opencolorio openexr expat portaudio \
fmt mesa libxkbcommon
- uses: actions/checkout@v4
with:
submodules: true
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
cmake ninja-build pkg-config \
qt6-base-dev qt6-base-dev-tools qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
libopencolorio-dev libopenimageio-dev libopenexr-dev libexpat1-dev \
portaudio19-dev libgl1-mesa-dev libxkbcommon-dev \
wget fuse3 desktop-file-utils
- name: Build
run: |
cmake -S . -B build -G Ninja \
+1 -22
View File
@@ -33,30 +33,10 @@ jobs:
sudo apt-get install -y \
ninja-build pkg-config nasm \
qt6-base-dev qt6-base-dev-tools qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
libopencolorio-dev libopenimageio-dev libopenexr-dev libexpat1-dev \
portaudio19-dev libgl1-mesa-dev libxkbcommon-dev
- name: Build FFmpeg from source (Linux)
if: runner.os == 'Linux'
run: |
git clone --branch n8.1.1 --depth 1 https://git.ffmpeg.org/ffmpeg.git ffmpeg-src
cd ffmpeg-src
./configure \
--prefix="$PWD/../ffmpeg-install" \
--enable-static \
--disable-shared \
--disable-doc \
--disable-programs \
--disable-avdevice \
--disable-network \
--enable-pic \
--enable-gpl \
--enable-version3
make -j$(nproc)
make install
cd ..
echo "FFMPEG_ROOT=$PWD/ffmpeg-install" >> "$GITHUB_ENV"
# ------------------------------------------------------------------
# macOS dependencies
# ------------------------------------------------------------------
@@ -115,7 +95,6 @@ jobs:
-DBUILD_TESTS=ON \
-DBUILD_QT6=ON \
-DOCIO_LOCATION=/usr \
-DFFMPEG_ROOT="${FFMPEG_ROOT}" \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- name: Configure (macOS)