CI: Switch to and adapt to Ubuntu 24 runner

WarmUpTill · Jan 2, 2025 · 42bccdf · 42bccdf
1 parent d7a244e
commit 42bccdf
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 18 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -20,6 +20,7 @@ body:
     - macOS 13
     - macOS 12
     - macOS 11
+    - Ubuntu 24.04
     - Ubuntu 23.10
     - Ubuntu 22.04
     - Other

diff --git a/.github/scripts/.Aptfile b/.github/scripts/.Aptfile
@@ -9,5 +9,5 @@ package 'libxtst-dev'
 package 'libxss-dev'
 package 'libopencv-dev'
 package 'libtesseract-dev'
-package 'libprocps-dev'
+package 'libproc2-dev'
 package 'libusb-1.0-0-dev'
diff --git a/.github/scripts/.build-deps.zsh b/.github/scripts/.build-deps.zsh
@@ -480,12 +480,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         popd
       ;;
     linux)
-      # Hacky workaround to support libproc2 with Ubuntu 22 build environment
-      local lsb_version=$(lsb_release -r | cut -f 2 || true)
-      if [[ "${lsb_version}" == '22.04' ]] {
-        sudo apt install ${project_root}/build-aux/CI/linux/ubuntu22/libproc2-0_4.0.2-3_amd64.deb
-        sudo apt install ${project_root}/build-aux/CI/linux/ubuntu22/libproc2-dev_4.0.2-3_amd64.deb
-      }
+      # Nothing to do for now
       ;;
   }
 }

diff --git a/.github/test b/.github/test
diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml
@@ -43,7 +43,7 @@ jobs:
           # devscripts and libobs-dev are needed but they were already installed
           # from check_libobs_revision and install_frontend_header sections.
           sudo apt update
-          sudo apt install cmake debhelper libcurl4-openssl-dev libxss-dev libxtst-dev qtbase5-dev libopencv-dev libprocps-dev
+          sudo apt install build-essential cmake debhelper libcurl4-openssl-dev libxss-dev libxtst-dev qtbase6-dev libopencv-dev libproc2-dev
       - name: build
         run: |
           debuild --no-lintian --no-sign

diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
@@ -10,7 +10,7 @@ env:
 jobs:
   check-event:
     name: Check GitHub Event Data 🔎
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash
@@ -177,7 +177,7 @@ jobs:
 
   ubuntu-build:
     name: Build for Ubuntu 🐧
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: check-event
     defaults:
       run:
@@ -241,14 +241,14 @@ jobs:
       - name: Upload Artifacts 📡
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-22.04-x86_64-${{ needs.check-event.outputs.commitHash }}
+          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*.*
 
       - name: Upload debug symbol artifacts 🪲
         uses: actions/upload-artifact@v4
         if: ${{ fromJSON(needs.check-event.outputs.package) }}
         with:
-          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-22.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
+          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*-dbgsym.ddeb
 
   windows-build:

diff --git a/.github/workflows/check-format.yaml b/.github/workflows/check-format.yaml
@@ -3,7 +3,7 @@ on:
   workflow_call:
 jobs:
   clang-format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -15,7 +15,7 @@ jobs:
           failCondition: error
 
   cmake-format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -31,7 +31,7 @@ jobs:
   create-release:
     name: Create Release 🛫
     if: github.ref_type == 'tag'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: build-project
     defaults:
       run:
@@ -77,7 +77,7 @@ jobs:
           variants=(
             'windows-x64;zip|exe'
             'macos-universal;tar.xz|pkg'
-            'ubuntu-22.04-x86_64;tar.xz|deb|ddeb'
+            'ubuntu-24.04-x86_64;tar.xz|deb|ddeb'
             'sources;tar.xz'
           )
 

diff --git a/build-aux/CI/linux/debian/control b/build-aux/CI/linux/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cmake,
                libcurl4-openssl-dev,
                libobs-dev,
                libxtst-dev,
-               qtbase5-dev,
+               qtbase6-dev,
                libxss-dev,
                libopencv-dev
 Standards-Version: 4.6.0

diff --git a/build-aux/CI/linux/debian/rules b/build-aux/CI/linux/debian/rules
@@ -3,7 +3,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-export QT_SELECT = qt5
+export QT_SELECT = qt6
 
 %:
 	dh $@

diff --git a/build-aux/CI/linux/ubuntu22/libproc2-0_4.0.2-3_amd64.deb b/build-aux/CI/linux/ubuntu22/libproc2-0_4.0.2-3_amd64.deb
diff --git a/build-aux/CI/linux/ubuntu22/libproc2-dev_4.0.2-3_amd64.deb b/build-aux/CI/linux/ubuntu22/libproc2-dev_4.0.2-3_amd64.deb
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-    export QT_SELECT = qt5
+    export QT_SELECT = qt6
     %:
     	dh $@
@@ Expand Down @@