mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-29 08:55:45 +00:00
f1ca8ed049
* Update CONTRIBUTING.md with information about DCO References: #7389 More information: https://about.gitlab.com/handbook/marketing/community-relations/code-contributor-program/#developer-certificate-of-origin-dco * Update CONTRIBUTING.md Co-Authored-By: zeripath <art27@cantab.net>
301 lines
14 KiB
Markdown
301 lines
14 KiB
Markdown
# Contribution Guidelines
|
|
|
|
## Table of Contents
|
|
|
|
- [Contribution Guidelines](#contribution-guidelines)
|
|
- [Introduction](#introduction)
|
|
- [Bug reports](#bug-reports)
|
|
- [Discuss your design](#discuss-your-design)
|
|
- [Testing redux](#testing-redux)
|
|
- [Vendoring](#vendoring)
|
|
- [Translation](#translation)
|
|
- [Code review](#code-review)
|
|
- [Styleguide](#styleguide)
|
|
- [Developer Certificate of Origin (DCO)](#developer-certificate-of-origin-dco)
|
|
- [Release Cycle](#release-cycle)
|
|
- [Maintainers](#maintainers)
|
|
- [Owners](#owners)
|
|
- [Versions](#versions)
|
|
- [Releasing Gitea](#releasing-gitea)
|
|
- [Copyright](#copyright)
|
|
|
|
## Introduction
|
|
|
|
This document explains how to contribute changes to the Gitea project.
|
|
It assumes you have followed the
|
|
[installation instructions](https://docs.gitea.io/en-us/).
|
|
Sensitive security-related issues should be reported to
|
|
[security@gitea.io](mailto:security@gitea.io).
|
|
|
|
For configuring IDE or code editor to develop Gitea see [IDE and code editor configuration](contrib/ide/)
|
|
|
|
## Bug reports
|
|
|
|
Please search the issues on the issue tracker with a variety of keywords
|
|
to ensure your bug is not already reported.
|
|
|
|
If unique, [open an issue](https://github.com/go-gitea/gitea/issues/new)
|
|
and answer the questions so we can understand and reproduce the
|
|
problematic behavior.
|
|
|
|
To show us that the issue you are having is in Gitea itself, please
|
|
write clear, concise instructions so we can reproduce the behavior—
|
|
even if it seems obvious. The more detailed and specific you are,
|
|
the faster we can fix the issue. Check out [How to Report Bugs
|
|
Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
|
|
|
|
Please be kind, remember that Gitea comes at no cost to you, and you're
|
|
getting free help.
|
|
|
|
## Discuss your design
|
|
|
|
The project welcomes submissions. If you want to change or add something,
|
|
please let everyone know what you're working on—[file an issue](https://github.com/go-gitea/gitea/issues/new)!
|
|
Significant changes must go through the change proposal process
|
|
before they can be accepted. To create a proposal, file an issue with
|
|
your proposed changes documented, and make sure to note in the title
|
|
of the issue that it is a proposal.
|
|
|
|
This process gives everyone a chance to validate the design, helps
|
|
prevent duplication of effort, and ensures that the idea fits inside
|
|
the goals for the project and tools. It also checks that the design is
|
|
sound before code is written; the code review tool is not the place for
|
|
high-level discussions.
|
|
|
|
## Testing redux
|
|
|
|
Before submitting a pull request, run all the tests for the whole tree
|
|
to make sure your changes don't cause regression elsewhere.
|
|
|
|
Here's how to run the test suite:
|
|
|
|
- Install the correct version of the drone-cli package. As of this
|
|
writing, the correct drone-cli version is
|
|
[1.1.0](https://docs.drone.io/cli/install/).
|
|
- Ensure you have enough free disk space. You will need at least
|
|
15-20 Gb of free disk space to hold all of the containers drone
|
|
creates (a default AWS or GCE disk size won't work -- see
|
|
[#6243](https://github.com/go-gitea/gitea/issues/6243)).
|
|
- Change into the base directory of your copy of the gitea repository,
|
|
and run `drone exec --event pull_request`.
|
|
|
|
The drone version, command line, and disk requirements do change over
|
|
time (see [#4053](https://github.com/go-gitea/gitea/issues/4053) and
|
|
[#6243](https://github.com/go-gitea/gitea/issues/6243)); if you
|
|
discover any issues, please feel free to send us a pull request to
|
|
update these instructions.
|
|
|
|
## Vendoring
|
|
|
|
We keep a cached copy of dependencies within the `vendor/` directory,
|
|
managing updates via [Modules](https://golang.org/cmd/go/#hdr-Module_maintenance).
|
|
|
|
Pull requests should only include `vendor/` updates if they are part of
|
|
the same change, be it a bugfix or a feature addition.
|
|
|
|
The `vendor/` update needs to be justified as part of the PR description,
|
|
and must be verified by the reviewers and/or merger to always reference
|
|
an existing upstream commit.
|
|
|
|
You can find more information on how to get started with it on the [Modules Wiki](https://github.com/golang/go/wiki/Modules).
|
|
|
|
## Translation
|
|
|
|
We do all translation work inside [Crowdin](https://crowdin.com/project/gitea).
|
|
The only translation that is maintained in this git repository is
|
|
[`en_US.ini`](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini)
|
|
and is synced regularly to Crowdin. Once a translation has reached
|
|
A SATISFACTORY PERCENTAGE it will be synced back into this repo and
|
|
included in the next released version.
|
|
|
|
## Building Gitea
|
|
|
|
Generally, the go build tools are installed as-needed in the `Makefile`.
|
|
An exception are the tools to build the CSS and images.
|
|
|
|
- To build CSS: Install [Node.js](https://nodejs.org/en/download/package-manager) at version 8.0 or above
|
|
with `npm` and then run `npm install` and `make css`.
|
|
- To build Images: ImageMagick, inkscape and zopflipng binaries must be
|
|
available in your `PATH` to run `make generate-images`.
|
|
|
|
## Code review
|
|
|
|
Changes to Gitea must be reviewed before they are accepted—no matter who
|
|
makes the change, even if they are an owner or a maintainer. We use GitHub's
|
|
pull request workflow to do that. And, we also use [LGTM](http://lgtm.co)
|
|
to ensure every PR is reviewed by at least 2 maintainers.
|
|
|
|
Please try to make your pull request easy to review for us. And, please read
|
|
the *[How to get faster PR reviews](https://github.com/kubernetes/community/blob/261cb0fd089b64002c91e8eddceebf032462ccd6/contributors/guide/pull-requests.md#best-practices-for-faster-reviews)* guide;
|
|
it has lots of useful tips for any project you may want to contribute.
|
|
Some of the key points:
|
|
|
|
* Make small pull requests. The smaller, the faster to review and the
|
|
more likely it will be merged soon.
|
|
* Don't make changes unrelated to your PR. Maybe there are typos on
|
|
some comments, maybe refactoring would be welcome on a function... but
|
|
if that is not related to your PR, please make *another* PR for that.
|
|
* Split big pull requests into multiple small ones. An incremental change
|
|
will be faster to review than a huge PR.
|
|
|
|
## Styleguide
|
|
|
|
For imports you should use the following format (_without_ the comments)
|
|
```go
|
|
import (
|
|
// stdlib
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
// local packages
|
|
"code.gitea.io/gitea/models"
|
|
"code.gitea.io/sdk/gitea"
|
|
|
|
// external packages
|
|
"github.com/foo/bar"
|
|
"gopkg.io/baz.v1"
|
|
)
|
|
```
|
|
|
|
## Developer Certificate of Origin (DCO)
|
|
|
|
We consider the act of contributing to the code by submitting a Pull
|
|
Request as the "Sign off" or agreement to the certifications and terms
|
|
of the [DCO](DCO) and [MIT license](LICENSE). No further action is required.
|
|
Additionally you could add a line at the end of your commit message.
|
|
|
|
```
|
|
Signed-off-by: Joe Smith <joe.smith@email.com>
|
|
```
|
|
|
|
If you set your `user.name` and `user.email` git configs, you can add the
|
|
line to the end of your commit automatically with `git commit -s`.
|
|
|
|
We assume in good faith that the information you provide is legally binding.
|
|
|
|
## Release Cycle
|
|
|
|
We adopted a release schedule to streamline the process of working
|
|
on, finishing, and issuing releases. The overall goal is to make a
|
|
minor release every two months, which breaks down into one month of
|
|
general development followed by one month of testing and polishing
|
|
known as the release freeze. All the feature pull requests should be
|
|
merged in the first month of one release period. And, during the frozen
|
|
period, a corresponding release branch is open for fixes backported from
|
|
master. Release candidates are made during this period for user testing to
|
|
obtain a final version that is maintained in this branch. A release is
|
|
maintained by issuing patch releases to only correct critical problems
|
|
such as crashes or security issues.
|
|
|
|
Major release cycles are bimonthly. They always begin on the 25th and end on
|
|
the 24th (i.e., the 25th of December to February 24th).
|
|
|
|
During a development cycle, we may also publish any necessary minor releases
|
|
for the previous version. For example, if the latest, published release is
|
|
v1.2, then minor changes for the previous release—e.g., v1.1.0 -> v1.1.1—are
|
|
still possible.
|
|
|
|
## Maintainers
|
|
|
|
To make sure every PR is checked, we have [team
|
|
maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least
|
|
two maintainers (or owners) before it can get merged. A maintainer
|
|
should be a contributor of Gitea (or Gogs) and contributed at least
|
|
4 accepted PRs. A contributor should apply as a maintainer in the
|
|
[Discord](https://discord.gg/NsatcWJ) #develop channel. The owners
|
|
or the team maintainers may invite the contributor. A maintainer
|
|
should spend some time on code reviews. If a maintainer has no
|
|
time to do that, they should apply to leave the maintainers team
|
|
and we will give them the honor of being a member of the [advisors
|
|
team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if
|
|
an advisor has time to code review, we will gladly welcome them back
|
|
to the maintainers team. If a maintainer is inactive for more than 3
|
|
months and forgets to leave the maintainers team, the owners may move
|
|
him or her from the maintainers team to the advisors team.
|
|
For security reasons, Maintainers should use 2FA for their accounts and
|
|
if possible provide gpg signed commits.
|
|
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
|
|
https://help.github.com/articles/signing-commits-with-gpg/
|
|
|
|
## Owners
|
|
|
|
Since Gitea is a pure community organization without any company support,
|
|
to keep the development healthy we will elect three owners every year. All
|
|
contributors may vote to elect up to three candidates, one of which will
|
|
be the main owner, and the other two the assistant owners. When the new
|
|
owners have been elected, the old owners will give up ownership to the
|
|
newly elected owners. If an owner is unable to do so, the other owners
|
|
will assist in ceding ownership to the newly elected owners.
|
|
For security reasons, Owners or any account with write access (like a bot)
|
|
must use 2FA.
|
|
https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
|
|
|
|
After the election, the new owners should proactively agree
|
|
with our [CONTRIBUTING](CONTRIBUTING.md) requirements in the
|
|
[Discord](https://discord.gg/NsatcWJ) #general channel. Below are the
|
|
words to speak:
|
|
|
|
```
|
|
I'm honored to having been elected an owner of Gitea, I agree with
|
|
[CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea
|
|
and lead the development of Gitea.
|
|
```
|
|
|
|
To honor the past owners, here's the history of the owners and the time
|
|
they served:
|
|
|
|
* 2016-11-04 ~ 2017-12-31
|
|
* [Lunny Xiao](https://github.com/lunny) <xiaolunwen@gmail.com>
|
|
* [Thomas Boerger](https://github.com/tboerger) <thomas@webhippie.de>
|
|
* [Kim Carlbäcker](https://github.com/bkcsoft) <kim.carlbacker@gmail.com>
|
|
|
|
* 2018-01-01 ~ 2018-12-31
|
|
* [Lunny Xiao](https://github.com/lunny) <xiaolunwen@gmail.com>
|
|
* [Lauris Bukšis-Haberkorns](https://github.com/lafriks) <lauris@nix.lv>
|
|
* [Kim Carlbäcker](https://github.com/bkcsoft) <kim.carlbacker@gmail.com>
|
|
|
|
* 2019-01-01 ~ 2019-12-31
|
|
* [Lunny Xiao](https://github.com/lunny) <xiaolunwen@gmail.com>
|
|
* [Lauris Bukšis-Haberkorns](https://github.com/lafriks) <lauris@nix.lv>
|
|
* [Matti Ranta](https://github.com/techknowlogick) <matti@mdranta.net>
|
|
|
|
## Versions
|
|
|
|
Gitea has the `master` branch as a tip branch and has version branches
|
|
such as `release/v0.9`. `release/v0.9` is a release branch and we will
|
|
tag `v0.9.0` for binary download. If `v0.9.0` has bugs, we will accept
|
|
pull requests on the `release/v0.9` branch and publish a `v0.9.1` tag,
|
|
after bringing the bug fix also to the master branch.
|
|
|
|
Since the `master` branch is a tip version, if you wish to use Gitea
|
|
in production, please download the latest release tag version. All the
|
|
branches will be protected via GitHub, all the PRs to every branch must
|
|
be reviewed by two maintainers and must pass the automatic tests.
|
|
|
|
## Releasing Gitea
|
|
|
|
* Let $vmaj, $vmin and $vpat be Major, Minor and Patch version numbers, $vpat should be rc1, rc2, 0, 1, ...... $vmaj.$vmin will be kept the same as milestones on github or gitea in future.
|
|
* Before releasing, confirm all the version's milestone issues or PRs has been resolved. Then discuss the release on discord channel #maintainers and get agreed with almost all the owners and mergers. Or you can declare the version and if nobody against in about serval hours.
|
|
* If this is a big version first you have to create PR for changelog on branch `master` with PRs with label `changelog` and after it has been merged do following steps:
|
|
* Create `-dev` tag as `git tag -s -F release.notes v$vmaj.$vmin.0-dev` and push the tag as `git push origin v$vmaj.$vmin.0-dev`.
|
|
* When CI has finished building tag then you have to create a new branch named `release/v$vmaj.$vmin`
|
|
* If it is bugfix version create PR for changelog on branch `release/v$vmaj.$vmin` and wait till it is reviewed and merged.
|
|
* Add a tag as `git tag -s -F release.notes v$vmaj.$vmin.$`, release.notes file could be a temporary file to only include the changelog this version which you added to `CHANGELOG.md`.
|
|
* And then push the tag as `git push origin v$vmaj.$vmin.$`. Drone CI will automatically created a release and upload all the compiled binary. (But currently it didn't add the release notes automatically. Maybe we should fix that.)
|
|
* If needed send PR for changelog on branch `master`.
|
|
* Send PR to [blog repository](https://github.com/go-gitea/blog) announcing the release.
|
|
|
|
## Copyright
|
|
|
|
Code that you contribute should use the standard copyright header:
|
|
|
|
```
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
```
|
|
|
|
Files in the repository contain copyright from the year they are added
|
|
to the year they are last changed. If the copyright author is changed,
|
|
just paste the header below the old one.
|