Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ArchComponent_03_Fix-Placement-Multiplicat…
…ion_r
- Loading branch information
Showing
4,998 changed files
with
1,328,911 additions
and
1,124,422 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| name: Report a Problem | ||
| description: File an problem report | ||
| title: "[Problem] " | ||
| labels: ["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. | ||
| options: | ||
| - label: I have searched the existing issues | ||
| required: true | ||
| - type: dropdown | ||
| id: version | ||
| attributes: | ||
| label: Version | ||
| description: What version of FreeCAD are you running? | ||
| options: | ||
| - 0.20 (Release) | ||
| - 0.21 (Development) | ||
| 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. | ||
| render: shell | ||
| validations: | ||
| required: true | ||
| - type: dropdown | ||
| id: wb | ||
| attributes: | ||
| label: Subproject(s) affected? | ||
| options: | ||
| - Addon Manager | ||
| - Arch | ||
| - Core | ||
| - Draft | ||
| - Expressions | ||
| - FEM | ||
| - File formats | ||
| - GCS | ||
| - OpenSCAD | ||
| - Part | ||
| - PartDesign | ||
| - Path | ||
| - Project Tools & Websites | ||
| - Sketcher | ||
| - Spreadsheet | ||
| - Techdraw | ||
| - Other (specify in description) | ||
| - 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. | ||
| placeholder: Description of the problem | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| id: anything_else | ||
| attributes: | ||
| label: Anything else? | ||
| 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. | ||
| 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: | ||
| required: false | ||
| - type: checkboxes | ||
| 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) | ||
| options: | ||
| - label: I agree to follow this project's Code of Conduct | ||
| required: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,8 @@ | ||
| Thank you for creating a pull request to contribute to FreeCAD! To ease integration, we ask you to conform to the following items. Pull requests which don't satisfy all the items below might be rejected. If you are in doubt with any of the items below, don't hesitate to ask for help in the [FreeCAD forum](https://forum.freecadweb.org/viewforum.php?f=10)! | ||
| Thank you for creating a pull request to contribute to FreeCAD! Place an "X" in between the brackets below to "check off" to confirm that you have satisfied the requirement, or ask for help in the [FreeCAD forum](https://forum.freecadweb.org/viewforum.php?f=10) if there is something you don't understand. | ||
|
|
||
| - [ ] Your pull request is confined strictly to a single module. That is, all the files changed by your pull request are either in `App`, `Base`, `Gui` or one of the `Mod` subfolders. If you need to make changes in several locations, make several pull requests and wait for the first one to be merged before submitting the next ones | ||
| - [ ] In case your pull request does more than just fixing small bugs, make sure you discussed your ideas with other developers on the FreeCAD forum | ||
| - [ ] Your branch is [rebased](https://git-scm.com/docs/git-rebase) on latest master `git pull --rebase upstream master` | ||
| - [ ] All FreeCAD unit tests are confirmed to pass by running `./bin/FreeCAD --run-test 0` | ||
| - [ ] All commit messages are [well-written](https://chris.beams.io/posts/git-commit/) ex: `Fixes typo in Draft Move command text` | ||
| - [ ] Your pull request is well written and has a good description, and its title starts with the module name, ex: `Draft: Fixed typos` | ||
| - [ ] Commit messages include `issue #<id>` or `fixes #<id>` where `<id>` is the issue ID number from our [Issues database](https://github.com/FreeCAD/FreeCAD/issues) in case a particular commit solves or is related to an existing issue. Ex: `Draft: fix typos - fixes #4805` | ||
| - [ ] Your Pull Request meets the requirements outlined in section 5 of [CONTRIBUTING.md](https://github.com/FreeCAD/FreeCAD/blob/master/CONTRIBUTING.md) for a Valid PR | ||
|
|
||
| And please remember to update the Wiki with the features added or changed once this PR is merged. | ||
| Please remember to update the Wiki with the features added or changed once this PR is merged. | ||
| **Note**: If you don't have wiki access, then please mention your contribution on the [1.0 Changelog Forum Thread](https://forum.freecad.org/viewtopic.php?f=10&t=69438). | ||
|
|
||
| --- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| # *************************************************************************** | ||
| # * Copyright (c) 2023 0penBrain * | ||
| # * * | ||
| # * This program is free software; you can redistribute it and/or modify * | ||
| # * it under the terms of the GNU Lesser General Public License (LGPL) * | ||
| # * as published by the Free Software Foundation; either version 2 of * | ||
| # * the License, or (at your option) any later version. * | ||
| # * for detail see the LICENCE text file. * | ||
| # * * | ||
| # * This program is distributed in the hope that it will be useful, * | ||
| # * but WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
| # * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | ||
| # * GNU Library General Public License for more details. * | ||
| # * * | ||
| # * You should have received a copy of the GNU Library General Public * | ||
| # * License along with this program; if not, write to the Free Software * | ||
| # * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * | ||
| # * USA * | ||
| # * * | ||
| # *************************************************************************** | ||
|
|
||
| # This is the master workflow for CI of FreeCAD. | ||
| # It (only) aims at properly organizing the sub-workflows. | ||
|
|
||
| name: FreeCAD master CI | ||
|
|
||
| on: [workflow_dispatch, push, pull_request] | ||
|
|
||
| concurrency: | ||
| group: FC-CI-${{ github.head_ref || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
|
|
||
| Prepare: | ||
| uses: ./.github/workflows/sub_prepare.yml | ||
| with: | ||
| artifactBasename: Prepare-${{ github.run_id }} | ||
|
|
||
| Build2004: | ||
| needs: [Prepare] | ||
| uses: ./.github/workflows/sub_buildUbuntu2004.yml | ||
| with: | ||
| artifactBasename: Build2004-${{ github.run_id }} | ||
|
|
||
| Build2204: | ||
| needs: [Prepare] | ||
| uses: ./.github/workflows/sub_buildUbuntu2204.yml | ||
| with: | ||
| artifactBasename: Build2204-${{ github.run_id }} | ||
|
|
||
| Lint: | ||
| needs: [Prepare] | ||
| uses: ./.github/workflows/sub_lint.yml | ||
| with: | ||
| artifactBasename: Lint-${{ github.run_id }} | ||
| changedFiles: ${{ needs.Prepare.outputs.changedFiles }} | ||
| changedCppFiles: ${{ needs.Prepare.outputs.changedCppFiles }} | ||
| changedPythonFiles: ${{ needs.Prepare.outputs.changedPythonFiles }} | ||
|
|
||
| WrapUp: | ||
| needs: [Prepare, Build2004, Build2204, Lint] | ||
| if: always() | ||
| uses: ./.github/workflows/sub_wrapup.yml | ||
| with: | ||
| previousSteps: ${{ toJSON(needs) }} |
Oops, something went wrong.