Merge pull request #26894 from furgo16/ci-ubuntu2404-with-kde-neon-qt6

CI: re-enable and upgrade native Ubuntu build to 24.04

.github/workflows/CI_master.yml

@@ -52,12 +52,12 @@ jobs:
     with:
       artifactBasename: Pixi-${{ github.run_id }}
 
-#  Ubuntu:
-#    needs: [Prepare]
-#    if: "!startsWith(github.head_ref, 'refs/heads/backport-')"
-#    uses: ./.github/workflows/sub_buildUbuntu.yml
-#    with:
-#      artifactBasename: Ubuntu-${{ github.run_id }}
+  Ubuntu:
+    needs: [Prepare]
+    if: "!startsWith(github.head_ref, 'refs/heads/backport-')"
+    uses: ./.github/workflows/sub_buildUbuntu.yml
+    with:
+      artifactBasename: Ubuntu-${{ github.run_id }}
 
   Windows:
     needs: [Prepare]
@@ -83,6 +83,7 @@ jobs:
     needs: [
         Prepare,
         Pixi,
+        Ubuntu,
         Windows,
         Lint
       ]

.github/workflows/sub_buildUbuntu.yml

@@ -22,9 +22,9 @@
 # ***************************************************************************
 
 # This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on Ubuntu 22.04 using GCC.
+# This workflow aims at building and testing FreeCAD on Ubuntu 24.04 using GCC.
 
-name: Build Ubuntu 22.04
+name: Build Ubuntu 24.04
 
 on:
   workflow_call:
@@ -47,7 +47,7 @@ on:
 jobs:
 
   Build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     continue-on-error: ${{ inputs.allowedToFail }}
     env:
       CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
@@ -94,7 +94,7 @@ jobs:
           sudo apt-get update -y -qq
           sudo apt-get install -y -qq python3-pip
           python3 -m pip install --upgrade pip
-          python3 -m pip install ifcopenshell==0.8.2
+          python3 -m pip install ifcopenshell==0.8.2 --break-system-packages
 
       - name: Make needed directories, files and initializations
         id: Init

package/ubuntu/install-apt-packages.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
 set -euo pipefail
 
+# Add the KDE Neon repository for up-to-date and matching Qt6 and PySide packages
+# Ubuntu 24.04 does not have PySide6 packages available
+sudo wget -qO- http://archive.neon.kde.org/public.key | sudo gpg --dearmor -o /usr/share/keyrings/neon-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/neon-keyring.gpg] http://archive.neon.kde.org/user noble main" | sudo tee /etc/apt/sources.list.d/neon-qt.list
+
 # Update package lists quietly
 sudo apt-get update -qq
 
-if apt-cache show libvtk9-dev >/dev/null 2>&1; then
-  vtk_dev="libvtk9-dev"
-else
-  vtk_dev="libvtk7-dev"
-fi
-
 packages=(
   ccache
   cmake
@@ -35,13 +34,11 @@ packages=(
   libopencv-dev
   libproj-dev
   libpcl-dev
-  libpyside2-dev
-  libqt5opengl5-dev
-  libqt5svg5-dev
-  libqt5x11extras5-dev
-  libshiboken2-dev
+  libpyside6-dev
+  libqt6opengl6-dev
+  libqt6svg6-dev
   libspnav-dev
-  ${vtk_dev}
+  libvtk9-dev
   libx11-dev
   libxerces-c-dev
   libyaml-cpp-dev
@@ -50,8 +47,7 @@ packages=(
   netgen-headers
   ninja-build
   occt-draw
-  pyqt5-dev-tools
-  pyside2-tools
+  pyside6-tools
   python3-dev
   python3-defusedxml
   python3-git
@@ -62,14 +58,15 @@ packages=(
   python3-pivy
   python3-ply
   python3-pybind11
-  python3-pyside2.qtcore
-  python3-pyside2.qtgui
-  python3-pyside2.qtnetwork
-  python3-pyside2.qtsvg
-  python3-pyside2.qtwidgets
-  qtbase5-dev
-  qttools5-dev
-  shiboken2
+  python3-pyside6.qtcore
+  python3-pyside6.qtgui
+  python3-pyside6.qtnetwork
+  python3-pyside6.qtsvg
+  python3-pyside6.qtwidgets
+  qt6-base-dev
+  qt6-l10n-tools
+  qt6-tools-dev
+  qt6-tools-dev-tools
   swig
   xvfb
 )