diff --git a/.github/workflows/sub_buildUbuntu.yml b/.github/workflows/sub_buildUbuntu.yml index 586c10efc9..4350270aad 100644 --- a/.github/workflows/sub_buildUbuntu.yml +++ b/.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,8 @@ 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 + python3 -m pip install pyside6==6.4.2 --break-system-packages - name: Make needed directories, files and initializations id: Init diff --git a/package/ubuntu/install-apt-packages.sh b/package/ubuntu/install-apt-packages.sh index 9122e692eb..a9e9bc9abb 100755 --- a/package/ubuntu/install-apt-packages.sh +++ b/package/ubuntu/install-apt-packages.sh @@ -4,12 +4,6 @@ set -euo pipefail # 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 +29,10 @@ packages=( libopencv-dev libproj-dev libpcl-dev - libpyside2-dev - libqt5opengl5-dev - libqt5svg5-dev - libqt5x11extras5-dev - libshiboken2-dev + libqt6opengl6-dev + libqt6svg6-dev libspnav-dev - ${vtk_dev} + libvtk9-dev libx11-dev libxerces-c-dev libyaml-cpp-dev @@ -50,8 +41,6 @@ packages=( netgen-headers ninja-build occt-draw - pyqt5-dev-tools - pyside2-tools python3-dev python3-defusedxml python3-git @@ -62,14 +51,10 @@ 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 + qt6-base-dev + qt6-l10n-tools + qt6-tools-dev + qt6-tools-dev-tools swig xvfb )