Patch 21

.git-blame-ignore-revs

@@ -98,3 +98,5 @@ db24eeec535f1f43fb3d5b63d24c5171af637880 # RE: Final application of pre-commit
 b8f8b232cb0882d171cb299e6f6279a516cdd6eb # Inspection: Final application of pre-commit
 c5c2ea3498f402c0c89916c46ddb071e22756622 # Assembly: Final application of pre-commit
 592c992b863549fde52741fd8830418168387695 # Assembly: Apply pre-commit to Assembly files
+94ca51b7799b2ac60a2a56d7e6e753bb97a73671 # PartDesign: Fix #9377 - issue with accuracy in AdditiveHelix (#11312)
+d472927bba7b2d8d151c99fb29cf1d8dd099ea7d # Correct PartDesign Helix feature negative angles (#11399)

.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml

@@ -34,6 +34,7 @@ body:
       options:
         - Addon Manager
         - Arch
+        - Assembly
         - Core
         - Draft
         - Expressions

.github/workflows/CI_cleanup.yml

@@ -103,7 +103,7 @@ jobs:
           done
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.job }}-Logs
           path: |

.github/workflows/actions/linux/build/action.yml

@@ -48,6 +48,7 @@ runs:
       id: build
       shell: bash -l {0}
       run: |
+        set -o pipefail
         (stdbuf -oL -eL cmake --build ${{ inputs.builddir }} -j$(nproc) ${{ inputs.extraParameters }}) \
         2> >(tee -a ${{ inputs.errorFile }}) | tee -a ${{ inputs.logFile }}
     - name: Write report

.github/workflows/actions/linux/configure/action.yml

@@ -52,6 +52,7 @@ runs:
       id: configure
       shell: bash -l {0}
       run: |
+        set -o pipefail
         (stdbuf -oL -eL cmake -S ${{ inputs.sourcedir }} -B ${{ inputs.builddir }} -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE ${{inputs.extraParameters }}) \
         2> >(tee -a ${{ inputs.errorFile }}) | tee -a ${{ inputs.logFile }}
     - name: Write report

.github/workflows/actions/linux/install/action.yml

@@ -48,6 +48,7 @@ runs:
       id: install
       shell: bash -l {0}
       run: |
+        set -o pipefail
         (stdbuf -oL -eL sudo cmake --install ${{ inputs.builddir }} ${{ inputs.extraParameters }}) \
         2> >(tee -a ${{ inputs.errorFile }}) | tee -a ${{ inputs.logFile }}
     - name: Write report

.github/workflows/actions/runCPPTests/runSingleTest/action.yml

@@ -45,7 +45,9 @@ runs:
   steps:
     - name: Run C++ tests
       shell: bash -l {0}
-      run: ${{ inputs.testCommand }} | tee -a ${{ inputs.testLogFile }}
+      run: |
+        set -o pipefail
+        ${{ inputs.testCommand }} | tee -a ${{ inputs.testLogFile }}
     - name: Parse test results
       if: always()
       id: report

.github/workflows/actions/runPythonTests/action.yml

@@ -45,6 +45,7 @@ runs:
       id: runTests
       shell: bash -l {0}
       run: |
+        set -o pipefail
         ${{ inputs.testCommand }} | sed -Ee "/[[:blank:]]*\([[:digit:]]{1,3} %\)[[:blank:]]*/d" | tee -a ${{ inputs.logFile }}
     - name: Write report
       shell: bash -l {0}

.github/workflows/actions/windows/getCcache/action.yml

@@ -41,11 +41,11 @@ inputs:
   ccachedownloadpath:
     description: "Path where to download ccache"
     required: false
-    default: https://github.com/ccache/ccache/releases/download/v4.8.2/
+    default: https://github.com/ccache/ccache/releases/download/v4.9/
   ccacheversion:
     description: "Ccache version to be downloaded"
     required: false
-    default: ccache-4.8.2-windows-x86_64
+    default: ccache-4.9-windows-x86_64
 
 runs:
   using: "composite"

.github/workflows/issue-metrics.yml

@@ -0,0 +1,43 @@
+name: Monthly issue metrics
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 15 * *'
+
+permissions:
+  issues: write
+  pull-requests: read
+
+jobs:
+  build:
+    name: issue metrics
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Get dates for last month
+      shell: bash
+      run: |
+        # Calculate the first day of the previous month
+        first_day=$(date -d "last month" +%Y-%m-01)
+
+        # Calculate the last day of the previous month
+        last_day=$(date -d "$first_day +1 month -1 day" +%Y-%m-%d)
+
+        #Set an environment variable with the date range
+        echo "$first_day..$last_day"
+        echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+
+    - name: Run issue-metrics tool
+      uses: github/issue-metrics@v2
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SEARCH_QUERY: 'repo:FreeCAD/FreeCAD is:issue created:${{ env.last_month }} -reason:"not planned"'
+
+    - name: Create issue
+      uses: peter-evans/create-issue-from-file@v4
+      with:
+        title: Monthly issue metrics report
+        token: ${{ secrets.GITHUB_TOKEN }}
+        content-filepath: ./issue_metrics.md
+        assignees: maxwxyz

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -68,11 +68,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
@@ -151,15 +151,15 @@ jobs:
           reportFile: ${{env.reportdir}}${{ env.reportfilename }}
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
             /var/crash/*FreeCAD*
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -68,11 +68,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
@@ -151,15 +151,15 @@ jobs:
           reportFile: ${{env.reportdir}}${{ env.reportfilename }}
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
             /var/crash/*FreeCAD*
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_buildUbuntu2004.yml

@@ -72,7 +72,7 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install FreeCAD dependencies
@@ -239,15 +239,15 @@ jobs:
           reportFile: ${{env.reportdir}}${{ env.reportfilename }}
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
             /var/crash/*FreeCAD*
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_buildUbuntu2204Conda.yml

@@ -66,11 +66,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
@@ -179,15 +179,15 @@ jobs:
           reportFile: ${{env.reportdir}}${{ env.reportfilename }}
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
             /var/crash/*FreeCAD*
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_buildWindows.yml

@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Make needed directories, files and initializations
@@ -131,7 +131,7 @@ jobs:
           . $env:ccachebindir\ccache -s
       - name: Move libpack bin folder to build folder # Shorter in time than copying with CMake FREECAD_COPY_LIBPACK_BIN_TO_BUILD
         run: |
-          Move-Item -Force -Path ${{ env.libpackdir }}bin -Destination ${{ env.builddir }}
+          Move-Item -Force -Path ${{ env.libpackdir }}bin/* -Destination ${{ env.builddir }}/bin
       - name: C++ unit tests
         if: false # Disabled because seems to not function on Windows build
         timeout-minutes: 1
@@ -142,7 +142,7 @@ jobs:
           . ${{ env.builddir }}\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}\integrationTests.log
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |

.github/workflows/sub_buildWindowsConda.yml

@@ -61,11 +61,11 @@ jobs:
 
     steps:
       - name: Checking out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
@@ -121,7 +121,7 @@ jobs:
           . build\release\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}/integrationTests.log
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |

.github/workflows/sub_lint.yml

@@ -198,7 +198,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Make needed directories, files and initializations
@@ -761,15 +761,15 @@ jobs:
           [ $clazyQT6Errors -eq 0 ]
       - name: Upload logs and fixes
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
             ${{ env.fixesdir }}
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_prepare.yml

@@ -148,14 +148,14 @@ jobs:
           echo "" >> $GITHUB_OUTPUT
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifactBasename }}-Logs
           path: |
             ${{ env.logdir }}
       - name: Upload report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.reportfilename }}
           path: |

.github/workflows/sub_wrapup.yml

@@ -54,7 +54,7 @@ jobs:
         run: |
           mkdir -p ${{ env.artifactsDownloadDir }}
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.artifactsDownloadDir }}
       - name: Save input data to file

.gitignore

@@ -1,9 +1,17 @@
 # file types to ignore
 .*
-!/.gitignore
 !/.clang-format
+!/.clang-tidy
 !/.git-blame-ignore-revs
 !/.gitattributes
+!/.gitignore
+!/.gitmodules
+!/.pre-commit-config.yaml
+!/.pylintrc
+!/.github/
+!/contrib/.vscode/
+!*.gitattributes
+!*.gitignore
 *.DS_Store
 *.pyc
 *.obj

.pre-commit-config.yaml

@@ -45,7 +45,7 @@ exclude: |
     )
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.5.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer

CMakeLists.txt

@@ -10,6 +10,12 @@ if (POLICY CMP0072)
     set(OpenGL_GL_PREFERENCE LEGACY)
 endif(POLICY CMP0072)
 
+# FindPythonInterp and FindPythonLibs modules are deprecated.
+# Currently, they are still used by shiboken's CMake files
+if (POLICY CMP0148)
+    cmake_policy(SET CMP0148 OLD)
+endif()
+
 option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON)
 
 if(FREECAD_USE_CCACHE)