Merge pull request #20822 from oursland/weekly-build-dependencies

CI: update weekly build dependencies.

.github/workflows/sub_weeklyBuild.yml

@@ -64,6 +64,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     environment: weekly-build
     steps:
+      # prevent running out of disk space on Ubuntu runners.
+      - name: Maximize build space
+        if: runner.os == 'Linux'
+        uses: AdityaGarg8/remove-unwanted-software@v5
+        with:
+          verbose: 'true'
+          remove-android: 'true'      # (frees ~9 GB)
+          remove-cached-tools: 'true' # (frees ~8.3 GB)
+
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
         with:

package/rattler-build/linux/create_bundle.sh

@@ -49,9 +49,8 @@ rm -rf ${conda_env}/lib/cmake/
 find . -name "*.h" -type f -delete
 find . -name "*.cmake" -type f -delete
 
-build_tag=$(git describe --tags)
 python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
-version_name="FreeCAD_${build_tag}-Linux-$(uname -m)-${python_version}"
+version_name="FreeCAD_${BUILD_TAG}-Linux-$(uname -m)-${python_version}"
 
 echo -e "\################"
 echo -e "version_name:  ${version_name}"

package/rattler-build/pixi.toml

@@ -20,7 +20,7 @@ backend = { name = "pixi-build-rattler-build", version = "*" }
 freecad = { path = "." }
 
 [feature.package.dependencies]
-python = "==3.12.9"
+python = ">=3.11,<3.12"
 
 ## Linux (x86-64)
 [feature.package.target.linux-64.dependencies]

package/rattler-build/recipe.yaml

@@ -15,13 +15,13 @@ build:
 requirements:
   build:
     - ccache
-    - cmake>=3.31.6,<4.0.0
+    - cmake
     - compilers
     - doxygen
     - ninja
     - noqt5
-    - python==3.12.9
-    - qt6-main==6.8.2
+    - python>=3.11,<3.12
+    - qt6-main<6.9
     - swig
 
     - if: linux and x86_64
@@ -108,8 +108,8 @@ requirements:
     - ply
     - pybind11
     - pyside6
-    - python==3.12.9
-    - qt6-main==6.8.2
+    - python>=3.11,<3.12
+    - qt6-main<6.9
     - six
     - smesh
     - vtk
@@ -117,8 +117,9 @@ requirements:
     - yaml-cpp
     - zlib
 
-    - if: windows
+    - if: win
       then:
+        - winpthreads-devel
         - tbb-devel
 
     - if: unix
@@ -142,7 +143,7 @@ requirements:
     - docutils
     - gmsh
     - graphviz
-    # - ifcopenshell
+    - ifcopenshell
     - jinja2
     - lark
     - lxml
@@ -160,10 +161,10 @@ requirements:
     - ply
     - pycollada
     - pyside6
-    - python==3.12.9
+    - python>=3.11,<3.12
     - pythonocc-core
     - pyyaml
-    - qt6-main==6.8.2
+    - qt6-main<6.9
     - requests
     - scipy
     - sympy

package/rattler-build/windows/create_bundle.sh

@@ -55,10 +55,8 @@ cp ssl-patch.py ${copy_dir}/bin/Lib/ssl.py
 echo '[Paths]' >> ${copy_dir}/bin/qt6.conf
 echo 'Prefix = ../lib/qt6' >> ${copy_dir}/bin/qt6.conf
 
-build_tag=$(git describe --tags)
 python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])')
-version_name="FreeCAD_${build_tag}-Windows-$(uname -m)-${python_version}"
-application_menu_name="FreeCAD_${build_tag}"
+version_name="FreeCAD_${BUILD_TAG}-Windows-$(uname -m)-${python_version}"
 
 echo -e "################"
 echo -e "version_name:  ${version_name}"