Merge branch 'FreeCAD:main' into CarbonCopy_Fix_SketchArchPython

.clang-tidy

@@ -2,7 +2,10 @@
 Checks:          'clang-diagnostic-*,clang-analyzer-*,boost-*,bugprone-*,
 performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,google-explicit-constructor,
 concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,
--readability-redundant-access-specifiers,-readability-qualified-auto'
+-readability-redundant-access-specifiers,-readability-qualified-auto,
+-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,
+-readability-convert-member-functions-to-static,-bugprone-easily-swappable-parameters,
+-cppcoreguidelines-pro-type-static-cast-downcast'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false

.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml

@@ -1,28 +1,28 @@
 name: Report a Problem
 description: Have you found something that does not work well, is too hard to do or is missing altogether? Please create a Problem Report.
-labels: ["needs triage"]
+labels: ["Status: Needs triage"]
 body:
   - type: checkboxes
     id: existing_issue
     attributes:
       label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the problem you encountered.
+      description: Please [search](https://github.com/FreeCAD/FreeCAD/issues) to see if a similar issue already exists for the problem you encountered.
       options:
       - label: I have searched the existing issues
         required: true
   - type: textarea
     id: description
     attributes:
       label: Problem description
-      description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error.
+      description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error. Ideally record a macro and attach it.
       placeholder: Description of the problem
     validations:
       required: true
   - type: textarea
     id: full_version
     attributes:
       label: Full version info
-      description: Please use the About FreeCAD dialog to copy your full version information and paste it here.
+      description: Please use the About FreeCAD dialog to copy your full version information and paste it here. Try reproducing the issue by restarting FreeCAD in safe mode too.
       render: shell
     validations:
       required: true
@@ -33,22 +33,21 @@ body:
       options:
         - Addon Manager
         - Assembly
-        - BIM/Arch
-        - CAM/Path
+        - BIM
+        - CAM
         - Core
         - Draft
         - Expressions
         - FEM
         - File formats
-        - GCS
         - Mesh
         - OpenSCAD
         - Part
         - PartDesign
         - Project Tools & Websites
         - Sketcher
         - Spreadsheet
-        - Techdraw
+        - TechDraw
         - Other (specify in description)
   - type: textarea
     id: anything_else
@@ -57,6 +56,7 @@ body:
       description: |
         Links? References? Anything that will give us more context about the issue you are encountering!
         If there is a discussion about the problem on the forum, provide link(s) here.
+        You can upload or copy your macro here to speed up the diagnosis and debugging.
 
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. To attach a FCStd file, ZIP it first (GitHub won't recognize the extension otherwise).
     validations:
@@ -65,7 +65,7 @@ body:
     id: terms
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/FreeCAD/FreeCAD/blob/master/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/FreeCAD/FreeCAD/blob/main/CODE_OF_CONDUCT.md)
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true

.github/labels.yml

@@ -2,86 +2,104 @@
 # source:
 # - any: ['src/**/*', '!src/docs/*']
 
-Core:
+# 'Mod' related labels
+
+"Mod: Core":
 - changed-files:
   - any-glob-to-any-file: ['src/App/**/*', 'src/Base/**/*', 'src/Gui/**/*']
 
 :octocat::
 - changed-files:
   - any-glob-to-any-file:  ['.github/**/*']
 
-Addon Manager:
+"Mod: Addon Manager":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/AddonManager/**/*']
 
-Materials:
+"Mod: Materials":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Material/**/*']
 
-WB BIM:
+"Mod: Measurement":
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Measure/**/*']
+
+"Mod: BIM":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/BIM/**/*']
 
-WB Assembly:
+"Mod: Assembly":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Assembly/**/*']
 
-WB Draft:
+"Mod: Draft":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Draft/**/*']
 
-WB FEM:
+"Mod: FEM":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Fem/**/*']
 
-WB Mesh:
+"Mod: Mesh":
 - changed-files:
   - any-glob-to-any-file: ['src/Mod/Mesh/**/*']
 
-WB MeshPart:
+"Mod: MeshPart":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/MeshPart/**/*']
 
-WB OpenSCAD:
+"Mod: OpenSCAD":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/OpenSCAD/**/*']
 
-WB Part:
+"Mod: Part":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Part/**/*']
 
-WB Part Design:
+"Mod: Part Design":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/PartDesign/**/*']
 
-WB CAM:
+"Mod: CAM":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/CAM/**/*']
 
-WB Points:
+"Mod: Points":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Points/**/*']
 
-WB ReverseEngineering:
+"Mod: Reverse Engineering":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/ReverseEngineering/**/*']
 
-WB Sketcher:
+"Mod: Sketcher":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Sketcher/**/*']
 
-WB Spreadsheet:
+"Mod: Spreadsheet":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Spreadsheet/**/*']
 
-WB Surface:
+"Mod: Surface":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Surface/**/*/']
 
-WB TechDraw:
+"Mod: TechDraw":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/TechDraw/**/*']
 
-WB Test:
+"Mod: Test":
 - changed-files:
   - any-glob-to-any-file:  ['src/Mod/Test/**/*']
+
+# 'Packaging' related labels
+
+"Packaging/building":
+- changed-files:
+  - any-glob-to-any-file:  ['cMake/**/*']
+
+# 'Topic' related labels
+
+"Topic: Stylesheets":
+- changed-files:
+  - any-glob-to-any-file:  ['src/Gui/Stylesheets/**/*']

.github/workflows/CI_master.yml

@@ -63,17 +63,24 @@ jobs:
     with:
       artifactBasename: Ubuntu_22-04_Conda-${{ github.run_id }}
 
+  Ubuntu_22-04_Conda_Qt6:
+    needs: [Prepare]
+    uses: ./.github/workflows/sub_buildUbuntu2204CondaQt6.yml
+    with:
+      artifactBasename: Ubuntu_22-04_Conda-Qt6-${{ github.run_id }}
+
   Windows:
     needs: [Prepare]
     uses: ./.github/workflows/sub_buildWindows.yml
     with:
       artifactBasename: Windows-${{ github.run_id }}
 
-  Windows_Conda:
-    needs: [Prepare]
-    uses: ./.github/workflows/sub_buildWindowsConda.yml
-    with:
-      artifactBasename: Windows_Conda-${{ github.run_id }}
+  ## Disable until the following issue is resolved: https://github.com/mamba-org/mamba/issues/3292
+  # Windows_Conda:
+  #   needs: [Prepare]
+  #   uses: ./.github/workflows/sub_buildWindowsConda.yml
+  #   with:
+  #     artifactBasename: Windows_Conda-${{ github.run_id }}
 
   Lint:
     needs: [Prepare]
@@ -92,7 +99,7 @@ jobs:
         Ubuntu_20-04,
         Ubuntu_22-04_Conda,
         Windows,
-        Windows_Conda,
+        # Windows_Conda,
         Lint
       ]
     if: always()

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

@@ -28,6 +28,9 @@ inputs:
   compiler:
     description: "Binary name/path of compiler to be used"
     required: true
+  qt_major_version:
+    description: "Major version number of qt to be used"
+    required: true
 outputs:
   cacheKey:
     description: "Cache key with distro and compiler version"
@@ -39,6 +42,6 @@ runs:
     - id: generateCacheKey
       shell: bash -l {0}
       run: |
-        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)
+        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)-qt${{ inputs.qt_major_version }}
         echo "Generated cache key : $cacheKey"
         echo "cacheKey=$cacheKey" >> $GITHUB_OUTPUT

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

@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.ccachebindir }}
-        key: ccacheforwin
+        key: ccacheforwin-${{ inputs.ccacheversion }}
     - name: Download ccache
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

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

@@ -41,11 +41,11 @@ inputs:
   libpackdownloadurl:
     description: "URL where to download libpack"
     required: false
-    default: https://github.com/FreeCAD/FreeCAD-LibPack/releases/download/2.10/LibPack-0.21-V2.10.7z
+    default: https://github.com/FreeCAD/FreeCAD-LibPack/releases/download/3.0.0RC4/LibPack-1.0.0-v3.0.0RC4-Release.7z
   libpackname:
     description: "Libpack name (once downloaded)"
     required: false
-    default: LibPack-0.21-V2.10
+    default: LibPack-1.0.0-v3.0.0RC4-Release
 
 runs:
   using: "composite"
@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.libpackdir }}
-        key: libpackforwin
+        key: libpackforwin-${{ inputs.libpackname }}
     - name: Download libpack
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildUbuntu2004.yml

@@ -152,6 +152,7 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with:

.github/workflows/sub_buildUbuntu2204Conda.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
@@ -102,6 +102,7 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with: