Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Policy for FreeCAD Contribution Process (FCP) #7638

Merged
merged 23 commits into from Nov 2, 2022

Conversation

sliptonic
Copy link
Member

fixes #7633

  • 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 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 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 in case a particular commit solves or is related to an existing issue. Ex: Draft: fix typos - fixes #4805

And 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.


@berndhahnebach
Copy link
Contributor

pipeline status for feature branch PR_7638. Pipeline 675518665 was triggered at 622acd3. All CI branches and pipelines.

CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
@berndhahnebach
Copy link
Contributor

pipeline status for feature branch PR_7638. Pipeline 675604972 was triggered at c8da550. All CI branches and pipelines.

CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
Copy link
Contributor

@berniev berniev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A person who merges patches

Before git: "diffs" and "patches".
Now: "pull request"

@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 675928934 was triggered at 8585f21. All CI branches and pipelines.

CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
Co-authored-by: Ajinkya Dahale <AjinkyaDahale@users.noreply.github.com>
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677721267 was triggered at 4a3d6bd. All CI branches and pipelines.

CONTRIBUTING.txt Outdated Show resolved Hide resolved
CONTRIBUTING.txt Outdated Show resolved Hide resolved
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677787288 was triggered at 3203252. All CI branches and pipelines.

@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677803356 was triggered at cc693b4. All CI branches and pipelines.

remove redefinition of 'user'
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677966682 was triggered at 091cffc. All CI branches and pipelines.

Change 'patch' to 'contribution'
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677970139 was triggered at 793e826. All CI branches and pipelines.

@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677975492 was triggered at 8e0dd97. All CI branches and pipelines.

Revise the policy for contributors to be included in the "About" dialog
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 677989040 was triggered at a867c35. All CI branches and pipelines.

Clarify 5.6
Change 2.4 to redirect users to forum for help/general discussion
Change 1.2 to strike 'useful'
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 678837225 was triggered at e65b6fe. All CI branches and pipelines.

Copy link
Member

@yorikvanhavre yorikvanhavre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent job! This is a very good text IMHO

CONTRIBUTING.md Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
Typo 1.1
Remove explicit time frame in 6.11.1
change capitalization in 6.11.2  "Primary Developer" is intentionally not defined.
Remove unnecessary "User" 6.11.17
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 678923285 was triggered at 1dc1158. All CI branches and pipelines.

@sliptonic sliptonic changed the title first draft of a process for formalizing the contribution process. Policy for FreeCAD Contribution Process (FCP) Oct 27, 2022
@sliptonic sliptonic marked this pull request as ready for review October 28, 2022 14:47
@sliptonic
Copy link
Member Author

The document is pretty tight now. contributions and reviews have slowed. I've removed the draft status but will continue to accept suggestions. And we can always revise it going forward.

@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 679940436 was triggered at e37ec28. All CI branches and pipelines.

Updating 8.1 policy for inviting maintainers
@freecadci
Copy link

pipeline status for feature branch PR_7638. Pipeline 680629062 was triggered at 8c434d0. All CI branches and pipelines.

@WandererFan WandererFan merged commit c490b93 into FreeCAD:master Nov 2, 2022
@WandererFan
Copy link
Contributor

Merged. Thanks to all!

@adrianinsaval
Copy link
Member

ironically, this PR was merged in violation of the policy, the commits should have been squashed

@sliptonic
Copy link
Member Author

ironically, this PR was merged in violation of the policy, the commits should have been squashed

That's an excellent point. However, one can argue that the policy wasn't in effect yet!

We will do better.
41-416284_doh-homer-simpson-quotes-on-quotestopics-homer-simpson

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] FreeCAD Contribution policy and process is confusing.