CI: have build.yml call configure.sh instead of duplicating deps work

OmniTroid · claude · OmniTroid · commit 9b70bc39f54e · 2026-06-23T12:47:33.000+02:00
Each platform job now collapses to: checkout → install Qt → run
./configure.sh → deploy + upload. The inline BASS/discord-rpc/QtApng/
themes downloads and the cmake/ninja invocations are gone — configure.sh
already does all of that, and on Windows runs windeployqt too.

To make configure.sh usable from CI:
- Add BUILD_TYPE= CLI override (replaces the hardcoded Debug default).
- find_ninja falls back to ninja on PATH when none is bundled with Qt;
  GitHub runners have ninja from the system rather than under Qt/Tools.

The Linux job keeps its patchelf + tar packaging and AppImage build,
since those are deployment artifacts that configure.sh isn't in the
business of producing. It also stages the qtapng .so into Qt's plugins
dir so appimagetool can pick it up.

Co-Authored-By: Claude Opus 4.7 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,6 @@
-# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
-# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+# Build matrix: each platform job installs Qt, runs ./configure.sh (which
+# handles deps, qtapng, themes, cmake+ninja, and windeployqt on Windows),
+# then deploys + uploads.
 name: CI Build
 
 on:
@@ -28,7 +29,7 @@ jobs:
       - uses: actions/checkout@master
         with:
           submodules: recursive
-      
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
@@ -37,75 +38,20 @@ jobs:
           arch: win64_mingw
           cache: true
           cache-key-prefix: install-qt-action
-          modules: 'qtimageformats qtwebsockets'
+          modules: 'qtimageformats qtwebsockets qtmultimedia'
 
-      - name: Install Windows Discord RPC
-        shell: bash
-        run: |
-          curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc.zip
-          unzip discord_rpc.zip
-          cp ./discord-rpc/win64-dynamic/lib/discord-rpc.lib ./lib/
-          cp ./discord-rpc/win64-dynamic/bin/discord-rpc.dll ./bin/
-          cp ./discord-rpc/win64-dynamic/include/discord*.h ./lib/
-          
-      - name: Install Windows BASS
+      - name: Configure and build
         shell: bash
         run: |
-          curl http://www.un4seen.com/files/bass24.zip -o bass.zip
-          unzip -d bass -o bass.zip
-          cp ./bass/c/bass.h ./lib
-          cp ./bass/c/x64/bass.lib ./lib/
-          cp ./bass/x64/bass.dll ./bin/
-
-          curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
-          unzip -d bass -o bassopus.zip
-          cp ./bass/c/bassopus.h ./lib
-          cp ./bass/c/x64/bassopus.lib ./lib/
-          cp ./bass/x64/bassopus.dll ./bin/
-
-      - name: Clone Apng plugin
-        uses: actions/checkout@master
-        with:
-          repository: jurplel/QtApng
-          path: ./qtapng
-
-      - name: Build Apng plugin
-        run: |
-          cd ./qtapng
-          cmake . -G "MinGW Makefiles"
-          cmake --build . --config Release
-          mkdir -p ${{ github.workspace }}/bin/imageformats/
-          cp plugins/imageformats/qapng.dll ${{ github.workspace }}/bin/imageformats/qapng.dll
-
-      - name: Build
-        run: |
-          cmake . -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release
-          cmake --build . --config Release
-
-      - name: Deploy Windows
-        working-directory: ${{github.workspace}}/bin/
-        shell: bash
-        run: |
-          windeployqt --no-quick-import --no-translations --no-compiler-runtime --no-opengl-sw ./Attorney_Online.exe
-
-      - name: Clone Themes
-        uses: actions/checkout@master
-        with:
-          repository: AttorneyOnline/AO2-Themes
-          path: "bin/base/themes"
-
-      - name: Cleanup Themes Checkout
-        run: |
-          rm ./bin/base/themes/.gitignore
-          rm ./bin/base/themes/.gitattributes
-          Remove-Item -Path "./bin/base/themes/.git" -Recurse -Force
+          QT_ROOT="$(cd "$QT_ROOT_DIR/../.." && pwd)"
+          ./configure.sh QT_ROOT="$QT_ROOT" QT_PATH="$QT_ROOT_DIR" BUILD_TYPE=Release
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         with:
           name: Attorney_Online-Windows
-          path: ${{github.workspace}}/bin
-  
+          path: ${{ github.workspace }}/bin
+
   build-linux:
     needs: formatting-check
     runs-on: ubuntu-22.04
@@ -124,103 +70,52 @@ jobs:
           arch: 'gcc_64'
           cache: true
           cache-key-prefix: install-qt-action
-          modules: 'qtimageformats qtwebsockets'
-
-      - name: Install Linux Discord RPC
-        run: |
-          curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc.zip
-          unzip discord_rpc.zip
-          cp ./discord-rpc/linux-dynamic/lib/libdiscord-rpc.so ./lib/
-          cp ./discord-rpc/linux-dynamic/lib/libdiscord-rpc.so ./bin/
-          cp ./discord-rpc/linux-dynamic/include/discord*.h ./src/
-
-      - name: Install Linux BASS
-        run: |
-          curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
-          unzip -d bass -o bass.zip
-          cp ./bass/c/bass.h ./lib
-          cp ./bass/libs/x86_64/libbass.so ./lib/
-          cp ./bass/libs/x86_64/libbass.so ./bin/
-
-          curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
-          unzip -d bass -o bassopus.zip
-          cp ./bass/c/bassopus.h ./lib
-          cp ./bass/libs/x86_64/libbassopus.so ./lib/
-          cp ./bass/libs/x86_64/libbassopus.so ./bin/
-
-      - name: Clone Apng plugin
-        uses: actions/checkout@master
-        with:
-          repository: jurplel/QtApng
-          path: ./qtapng
-
-      - name: Build Apng plugin
-        run: |
-          cd ./qtapng
-          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/bin/imageformats/"
-          cmake --build . --config Release
+          modules: 'qtimageformats qtwebsockets qtmultimedia'
 
-          # install plugin
-          cp plugins/imageformats/libqapng.so ${QT_ROOT_DIR}/plugins/imageformats
+      - name: Install system build tools
+        run: sudo apt-get update && sudo apt-get install -y ninja-build patchelf libxcb-cursor0
 
-      - name: Build
+      - name: Configure and build
         run: |
-          cmake .
-          cmake --build . --config Release
-
-      - name: Clone Themes
-        uses: actions/checkout@master
-        with:
-          repository: AttorneyOnline/AO2-Themes
-          path: "bin/base/themes"
+          QT_ROOT="$(cd "$QT_ROOT_DIR/../.." && pwd)"
+          ./configure.sh QT_ROOT="$QT_ROOT" QT_PATH="$QT_ROOT_DIR" BUILD_TYPE=Release
 
-      - name: Cleanup Themes Checkout
+      - name: Stage APNG plugin for AppImage
         run: |
-          rm ./bin/base/themes/.gitignore
-          rm ./bin/base/themes/.gitattributes
-          rm -r ./bin/base/themes/.git
+          mkdir -p "$QT_ROOT_DIR/plugins/imageformats"
+          cp qtapng/plugins/imageformats/libqapng.so "$QT_ROOT_DIR/plugins/imageformats/"
 
-      - name: Deploy Linux
+      - name: Package dynamic tarball
         shell: bash
         run: |
-          cd ${{ github.workspace }}/bin
-          mkdir ./imageformats
-          cp ../qtapng/plugins/imageformats/libqapng.so ./imageformats
+          cd "${{ github.workspace }}/bin"
           cp ../data/logo-client.png ./icon.png
           cp ../README_LINUX.md .
           cp ../scripts/DYNAMIC_INSTALL.sh ./INSTALL.sh
-          chmod +x INSTALL.sh
-          chmod +x Attorney_Online
-
+          chmod +x INSTALL.sh Attorney_Online
           patchelf --add-rpath . Attorney_Online
-
           cd ..
           tar --transform='flags=r;s|bin|Attorney Online|' -cvf Attorney_Online-Dynamic.tar bin
 
-      - name: Create AppImage
+      - name: Build AppImage
         shell: bash
         run: |
-          # necessary, apparently
-          sudo apt install libxcb-cursor0
           # from https://github.com/probonopd/go-appimage/blob/master/src/appimagetool/README.md
           wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
           mv appimagetool-*-x86_64.AppImage appimagetool
           chmod +x appimagetool
 
-          mkdir -p AppDir/usr/bin
-          mkdir -p AppDir/usr/lib/plugins/imageformats
-          mkdir -p AppDir/usr/share/applications
-
+          mkdir -p AppDir/usr/bin AppDir/usr/lib/plugins/imageformats AppDir/usr/share/applications
           cp bin/Attorney_Online AppDir/usr/bin
-          cp bin/lib*.so AppDir/usr/lib
+          cp bin/lib*.so AppDir/usr/lib 2>/dev/null || true
           cp scripts/Attorney_Online.desktop AppDir/usr/share/applications
           cp data/logo-client.png AppDir/Attorney_Online.png
 
           GIT_SHORT_SHA="${GITHUB_SHA::8}"
-          QTDIR=${QT_ROOT_DIR} ./appimagetool deploy AppDir/usr/share/applications/Attorney_Online.desktop
+          QTDIR="$QT_ROOT_DIR" ./appimagetool deploy AppDir/usr/share/applications/Attorney_Online.desktop
           ARCH=x86_64 VERSION=${GIT_SHORT_SHA} ./appimagetool AppDir
 
-      - name: Deploy AppImage
+      - name: Package AppImage tarball
         shell: bash
         run: |
           mkdir bin-appimage
@@ -229,9 +124,7 @@ jobs:
           cp README_LINUX.md bin-appimage
           cp scripts/APPIMAGE_INSTALL.sh bin-appimage/INSTALL.sh
           cp Attorney_Online-*-x86_64.AppImage bin-appimage
-          chmod +x bin-appimage/INSTALL.sh
-          chmod +x bin-appimage/Attorney_Online-*-x86_64.AppImage
-
+          chmod +x bin-appimage/INSTALL.sh bin-appimage/Attorney_Online-*-x86_64.AppImage
           tar --transform='flags=r;s|bin-appimage|Attorney Online|' -cvf Attorney_Online-AppImage.tar bin-appimage
 
       - name: Upload Dynamic Artifact
diff --git a/configure.sh b/configure.sh
@@ -37,6 +37,7 @@ print_help() {
     echo "  clean: Remove all files from lib, bin and tmp"
     echo "  QT_ROOT=path: Specify the root path to where Qt is installed (eg. /c/Qt/)"
     echo "  QT_PATH=path: Specify the exact Qt install to use, bypassing auto-detection (eg. /c/Qt/6.5.3/mingw_64)"
+    echo "  BUILD_TYPE=Debug|Release: CMake build type (default: Debug)"
 }
 
 # Check if a given command returns a non-zero exit code
@@ -168,18 +169,25 @@ find_mingw() {
 }
 
 find_ninja() {
-    # Find a ninja installation bundled with Qt
-    QT_TOOLS_PATH="${QT_ROOT}/Tools"
-
-    local ninja_path=""
-
+    # Prefer the ninja bundled with Qt, fall back to ninja on PATH.
+    local bundled=""
     if [[ "$PLATFORM" == "windows" ]]; then
-        ninja_path="${QT_TOOLS_PATH}/Ninja/ninja.exe"
+        bundled="${QT_ROOT}/Tools/Ninja/ninja.exe"
     else
-        ninja_path="${QT_TOOLS_PATH}/Ninja/ninja"
+        bundled="${QT_ROOT}/Tools/Ninja/ninja"
+    fi
+
+    if [[ -f "$bundled" ]]; then
+        echo "$bundled"
+        return 0
+    fi
+
+    if command -v ninja >/dev/null 2>&1; then
+        echo "ninja"
+        return 0
     fi
 
-    echo "$ninja_path"
+    echo ""
 }
 
 get_zip() {
@@ -376,6 +384,7 @@ configure() {
         case "$1" in
             QT_ROOT=*) QT_ROOT="${1#*=}" ;;
             QT_PATH=*) QT_PATH="${1#*=}" ;;
+            BUILD_TYPE=*) BUILD_CONFIG="${1#*=}" ;;
             *) echo "Unknown argument: $1"; print_help; exit 1 ;;
         esac
         shift
