Skip to content
This repository was archived by the owner on Mar 1, 2025. It is now read-only.

Commit 18761d7

Browse files
authored
Merge branch 'main' into td_revert_17726
2 parents 30a4497 + e698c73 commit 18761d7

File tree

524 files changed

+44281
-8419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

524 files changed

+44281
-8419
lines changed

.clang-tidy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Checks: 'clang-diagnostic-*,clang-analyzer-*,boost-*,bugprone-*,
33
performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,google-explicit-constructor,
4-
concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,
4+
concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,-readability-identifier-length,
55
-readability-redundant-access-specifiers,-readability-qualified-auto,
66
-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,
77
-readability-convert-member-functions-to-static,-bugprone-easily-swappable-parameters,
@@ -150,8 +150,6 @@ CheckOptions:
150150
value: '0'
151151
- key: concurrency-mt-unsafe.FunctionSet
152152
value: any
153-
- key: readability-identifier-length.IgnoredExceptionVariableNames
154-
value: '^[e]$'
155153
- key: google-readability-braces-around-statements.ShortStatementLines
156154
value: '1'
157155
- key: bugprone-reserved-identifier.AllowedIdentifiers

.github/problemMatcher/gcc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"__comment": "Taken from vscode-cpptools's Extension/package.json gcc rule",
3+
"problemMatcher": [
4+
{
5+
"owner": "gcc-problem-matcher",
6+
"pattern": [
7+
{
8+
"regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
9+
"file": 1,
10+
"line": 2,
11+
"column": 3,
12+
"severity": 4,
13+
"message": 5
14+
}
15+
]
16+
}
17+
]
18+
}

.github/problemMatcher/msvc.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"__comment": "Taken from vscode's vs/workbench/contrib/tasks/common/problemMatcher.ts msCompile rule",
3+
"problemMatcher": [
4+
{
5+
"owner": "msvc-problem-matcher",
6+
"pattern": [
7+
{
8+
"regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
9+
"file": 1,
10+
"line": 2,
11+
"column": 3,
12+
"severity": 4,
13+
"code": 5,
14+
"message": 6
15+
}
16+
]
17+
}
18+
]
19+
}

.github/workflows/CI_master.yml

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,49 +39,24 @@ jobs:
3939
with:
4040
artifactBasename: Prepare-${{ github.run_id }}
4141

42-
MacOS_13_Conda_Apple:
42+
Pixi:
4343
needs: [Prepare]
44-
uses: ./.github/workflows/sub_buildMacOSCondaApple.yml
44+
uses: ./.github/workflows/sub_buildPixi.yml
4545
with:
46-
artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }}
47-
48-
# MacOS_13_Conda_Intel:
49-
# needs: [Prepare]
50-
# uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml
51-
# with:
52-
# artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }}
46+
artifactBasename: Pixi-${{ github.run_id }}
5347

5448
Ubuntu_20-04:
5549
needs: [Prepare]
5650
uses: ./.github/workflows/sub_buildUbuntu2004.yml
5751
with:
5852
artifactBasename: Ubuntu_20-04-${{ github.run_id }}
5953

60-
Ubuntu_22-04_Conda:
61-
needs: [Prepare]
62-
uses: ./.github/workflows/sub_buildUbuntu2204Conda.yml
63-
with:
64-
artifactBasename: Ubuntu_22-04_Conda-${{ github.run_id }}
65-
66-
Ubuntu_22-04_Conda_Qt6:
67-
needs: [Prepare]
68-
uses: ./.github/workflows/sub_buildUbuntu2204CondaQt6.yml
69-
with:
70-
artifactBasename: Ubuntu_22-04_Conda-Qt6-${{ github.run_id }}
71-
7254
Windows:
7355
needs: [Prepare]
7456
uses: ./.github/workflows/sub_buildWindows.yml
7557
with:
7658
artifactBasename: Windows-${{ github.run_id }}
7759

78-
## Disable until the following issue is resolved: https://github.com/mamba-org/mamba/issues/3292
79-
# Windows_Conda:
80-
# needs: [Prepare]
81-
# uses: ./.github/workflows/sub_buildWindowsConda.yml
82-
# with:
83-
# artifactBasename: Windows_Conda-${{ github.run_id }}
84-
8560
Lint:
8661
needs: [Prepare]
8762
uses: ./.github/workflows/sub_lint.yml
@@ -94,12 +69,9 @@ jobs:
9469
WrapUp:
9570
needs: [
9671
Prepare,
97-
MacOS_13_Conda_Apple,
98-
# MacOS_13_Conda_Intel,
72+
Pixi,
9973
Ubuntu_20-04,
100-
Ubuntu_22-04_Conda,
10174
Windows,
102-
# Windows_Conda,
10375
Lint
10476
]
10577
if: always()
Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
# This workflow warns and then closes issues that have had no activity for a
2+
# specified amount of time. You can adjust the behavior by modifying this file.
3+
# For more information, see:
4+
# https://github.com/marketplace/actions/close-stale-issues
5+
# https://github.com/actions/stale/blob/master/action.yml
6+
# https://github.com/actions/stale
7+
---
8+
name: 'Stale Issues'
9+
on: # yamllint disable-line rule:truthy
10+
schedule:
11+
- cron: '0 0 * * *' # Run at 00:00 UTC every day
12+
workflow_dispatch:
13+
14+
permissions:
15+
contents: read
16+
issues: write # for actions/stale to close stale issues
17+
pull-requests: write # for actions/stale to close stale pull requests
18+
19+
jobs:
20+
stale:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: '🧹 Tag & close stale unconfirmed bugs'
24+
id: stale_issues
25+
uses: actions/[email protected]
26+
with:
27+
repo-token: ${{ secrets.GITHUB_TOKEN }}
28+
days-before-stale: -1
29+
days-before-issue-stale: 90
30+
days-before-issue-close: 20
31+
days-before-pr-stale: -1
32+
day-before-pr-close: -1
33+
operations-per-run: 100 # max num of ops per run
34+
stale-issue-label: 'Status: Stale'
35+
close-issue-label: 'Status: Auto-closing'
36+
exempt-issue-labels: 'Status: Confirmed,Priority: High,Priority: Critical,Blocker,Type: Feature,no-auto-close'
37+
remove-stale-when-updated: true
38+
ascending: true
39+
stale-issue-message: |
40+
Hi! This issue hasn’t seen activity in a while. If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the problem is resolved.
41+
42+
If the issue persists, let us know by adding a comment with any updates or details. Otherwise, we’ll close this issue automatically in 20 days to keep our backlog tidy. Feel free to comment anytime to keep it open. Closed issues can always be reopened.
43+
Thanks for helping improve FreeCAD!
44+
45+
Access additional [FreeCAD](https://freecad.org) resources:
46+
- **Forum**: https://forum.freecad.org
47+
- **Blog**: https://blog.freecad.org
48+
- **Wiki**: https://wiki.freecad.org
49+
50+
- name: '🧹 Close stale requested feedback issues'
51+
id: awaiting_issues
52+
uses: actions/[email protected]
53+
with:
54+
repo-token: ${{ secrets.GITHUB_TOKEN }}
55+
days-before-stale: -1
56+
days-before-issue-stale: 20
57+
days-before-issue-close: 20
58+
days-before-pr-stale: -1
59+
day-before-pr-close: -1
60+
operations-per-run: 30 # max num of ops per run
61+
stale-issue-label: 'Status: Stale'
62+
close-issue-label: 'Status: Auto-closing'
63+
only-labels: 'Status: Needs feedback,Status: Needs test on dev version,Status: Needs steps to reproduce'
64+
remove-stale-when-updated: true
65+
ascending: true
66+
stale-issue-message: |
67+
Hi! This issue hasn’t seen activity in a while despite the need for further feedback.
68+
If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the problem is resolved.
69+
70+
If the issue persists, let us know by adding a comment with any updates or details. Otherwise, we’ll close this issue automatically in 20 days to keep our backlog tidy. Feel free to comment anytime to keep it open. Closed issues can always be reopened.
71+
Thanks for helping improve FreeCAD!
72+
73+
Access additional [FreeCAD](https://freecad.org) resources:
74+
- **Forum**: https://forum.freecad.org
75+
- **Blog**: https://blog.freecad.org
76+
- **Wiki**: https://wiki.freecad.org
77+
78+
- name: '🧹 Tag & close inactive issues'
79+
id: inactive_issues
80+
uses: actions/[email protected]
81+
with:
82+
repo-token: ${{ secrets.GITHUB_TOKEN }}
83+
days-before-stale: -1
84+
days-before-issue-stale: 190
85+
days-before-issue-close: 60
86+
days-before-pr-stale: -1
87+
day-before-pr-close: -1
88+
operations-per-run: 30 # max num of ops per run
89+
stale-issue-label: 'Status: Stale'
90+
close-issue-label: 'Status: Auto-closing'
91+
exempt-issue-labels: 'Priority: High,Priority: Critical,Blocker,Type: Feature,no-auto-close'
92+
remove-stale-when-updated: true
93+
ascending: true
94+
stale-issue-message: |
95+
Hi! This issue hasn’t seen activity in a while. We automatically check each issue after 190 days without activity to keep the backlog tidy.
96+
If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the issue is already resolved.
97+
98+
If the issue is still relevant, let us know by adding a comment.
99+
Otherwise, we’ll close this issue automatically in 60 days.
100+
101+
Feel free to comment anytime to keep it open. Closed issues can always be reopened.
102+
Thanks for helping improve FreeCAD!
103+
104+
Access additional [FreeCAD](https://freecad.org) resources:
105+
- **Forum**: https://forum.freecad.org
106+
- **Blog**: https://blog.freecad.org
107+
- **Wiki**: https://wiki.freecad.org
108+
109+
- name: '🧹 Tag & close inactive PRs'
110+
id: inactive_pr
111+
uses: actions/[email protected]
112+
with:
113+
repo-token: ${{ secrets.GITHUB_TOKEN }}
114+
days-before-stale: -1
115+
days-before-issue-stale: -1
116+
days-before-issue-close: -1
117+
days-before-pr-stale: 150
118+
days-before-pr-close: 90
119+
operations-per-run: 30 # max num of ops per run
120+
stale-pr-label: 'Status: Stale'
121+
close-pr-label: 'Status: Auto-closing'
122+
exempt-pr-labels: 'Needs backport,Priority: High,Priority: Critical,no-auto-close'
123+
remove-stale-when-updated: true
124+
ascending: true
125+
stale-pr-message: |
126+
Thanks for helping improve FreeCAD!
127+
This pull request hasn’t seen activity in a while. We automatically check each PR after 160 days without activity to keep the repository tidy.
128+
129+
If the PR is still relevant, let us know by adding a comment.
130+
Otherwise, we’ll close this PR automatically in 90 days.
131+
132+
If you would like to keep working on this pull request, we advice to rebase it on current main branch, ask feedback from users or maintainers and engage with the community to get it forward.
133+

.github/workflows/stale_issues.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)