Update Linux CI

Author: rodlie

.github/workflows/linux.yml

@@ -20,9 +20,3 @@ jobs:
       with:
         name: friction-ci-linux-x86_64
         path: distfiles/builds/*/*.AppImage
-  qt6:
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: Build
-      run: APT=1 QT6="ON" CI=1 MKJOBS=2 ./src/scripts/ci.sh

.github/workflows/ubuntu.yml

@@ -1,17 +1,29 @@
 name: Ubuntu
 
-on: workflow_dispatch
+on: [push, pull_request]
 
 jobs:
-  jammy:
-    runs-on: ubuntu-22.04
+  qt5_15:
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: APT=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
-  noble:
+  qt5_15_arm:
+    runs-on: ubuntu-24.04-arm
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: APT=1 CI=1 CPU=aarch64 MKJOBS=2 ./src/scripts/ci.sh
+  qt6_4:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
-      run: APT=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
+      run: APT=1 QT6="ON" FFMPEG=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh
+  qt6_10:
+    runs-on: ubuntu-26.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: APT=1 QT6="ON" FFMPEG=1 CI=1 MKJOBS=2 ./src/scripts/ci.sh

src/scripts/ci.sh

@@ -17,14 +17,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Friction Qt5/Qt6 CI (Ubuntu 24.04)
+# Friction Ubuntu CI
 
 set -e -x
 
 CI=${CI:-0}
 APT=${APT:-0}
 PC=${PC:-""}
 QT6=${QT6:-"OFF"}
+CPU=${CPU:-"x86_64"} # or aarch64
+FFMPEG=${FFMPEG:-0}
 
 if [ "${QT6}" = "ON" ]; then
     QTV=6
@@ -97,17 +99,40 @@ fi
 CWD=`pwd`
 MKJOBS=${MKJOBS:-4}
 
+FFMPEG_URL=https://github.com/friction2d/ffmpeg
+FFMPEG_COMMIT=44b01dbdbe3a742b5d006a7187b63a8a30293a45
+FFMPEG_INSTALL=${CWD}/build-ci/ffmpeg-install
+
 cd ${CWD}
 rm -rf build-ci || true
 mkdir build-ci
 cd build-ci
 
+if [ "${FFMPEG}" = 1 ]; then
+    git clone ${FFMPEG_URL} ffmpeg-src
+    cd ffmpeg-src
+    ./configure \
+    --enable-shared \
+    --disable-static \
+    --prefix=${FFMPEG_INSTALL} \
+    --enable-gpl \
+    --enable-version3 \
+    --disable-programs \
+    --disable-debug
+    make -j${MKJOBS}
+    make install
+    export PKG_CONFIG_PATH=${FFMPEG_INSTALL}/lib/pkgconfig:${PKG_CONFIG_PATH}
+    export LD_LIBRARY_PATH=${FFMPEG_INSTALL}/lib:${LD_LIBRARY_PATH}
+fi
+
+cd ${CWD}/build-ci
+
 cmake -G Ninja \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_CXX_COMPILER=clang++ \
 -DCMAKE_C_COMPILER=clang \
--DQSCINTILLA_INCLUDE_DIRS=/usr/include/x86_64-linux-gnu/qt${QTV} \
+-DQSCINTILLA_INCLUDE_DIRS=/usr/include/${CPU}-linux-gnu/qt${QTV} \
 -DQSCINTILLA_LIBRARIES=qscintilla2_qt${QTV} \
 -DUSE_QT6=${QT6} \
 ..