2016-04-09 04:29:10 +08:00
|
|
|
|
**Guidelines, overview of maintenance process, etc.**
|
|
|
|
|
|
|
|
|
|
*“Thou shall GPG-sign.”*
|
|
|
|
|
|
|
|
|
|
# Git config
|
|
|
|
|
|
|
|
|
|
## GPG signing
|
|
|
|
|
|
2016-04-15 06:53:31 +08:00
|
|
|
|
While contributors are suggested to use GPG, as a maintainer you **are
|
|
|
|
|
required** to use GPG to sign commits & merges.
|
|
|
|
|
|
|
|
|
|
If you don't have GPG signing set up yet, now is the moment to do it.
|
|
|
|
|
|
|
|
|
|
[Config, etc.](/CONTRIBUTING.md#git-config)
|
2016-04-09 04:29:10 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## SSH
|
|
|
|
|
|
|
|
|
|
Preferably use SSH.
|
|
|
|
|
|
|
|
|
|
There are quite a few articles about that:
|
|
|
|
|
https://help.github.com/categories/ssh/
|
|
|
|
|
|
2016-04-15 06:53:31 +08:00
|
|
|
|
## Useful aliases
|
|
|
|
|
|
|
|
|
|
Check whether commits are GPG-signed with `git logs`
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
git config --global alias.logs 'log --show-signature'
|
|
|
|
|
```
|
|
|
|
|
|
2016-04-09 04:29:10 +08:00
|
|
|
|
# Commits
|
|
|
|
|
|
|
|
|
|
- **always** use [commit message format]
|
|
|
|
|
- **always** GPG-sign your commits.
|
|
|
|
|
- it's preferable to make a PR with changes that you're about to commit.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
|
2016-04-09 04:29:10 +08:00
|
|
|
|
Yes, there might be a situation where something has to be fixed "right now"
|
|
|
|
|
on master..
|
2019-04-24 23:37:25 +08:00
|
|
|
|
|
2016-04-09 04:29:10 +08:00
|
|
|
|
Perhaps a security fix, who knows what future holds. If it's not *that*
|
|
|
|
|
important, you're still better off making a PR. Even when you'll just
|
|
|
|
|
fast-forward commits from PR onto the `master` branch.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
|
2016-04-09 04:29:10 +08:00
|
|
|
|
Reasoning for it is that it's always hard to catch bugs/mistakes that you
|
|
|
|
|
create, while someone else who just briefly looked at the changeset possibly
|
|
|
|
|
can see a problem `:)`
|
|
|
|
|
|
|
|
|
|
# Pull requests
|
|
|
|
|
|
2016-08-08 18:38:28 +08:00
|
|
|
|
- **do not** push any `Merge`, `Squash & Merge`, etc. buttons on the website!
|
|
|
|
|
The only allowed way of merging is locally, since otherwise merge will not
|
|
|
|
|
be signed, and websites can fairly well mess things up.
|
2016-04-09 04:29:10 +08:00
|
|
|
|
- **always** test PR that is being merged.
|
|
|
|
|
- **always** GPG-sign PR that you're merging.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
|
2016-10-07 21:06:22 +08:00
|
|
|
|
Commits that are about to be merged don't have to be signed, but the
|
|
|
|
|
merge-commit **must** be signed. To simplify the process, and ensure that
|
|
|
|
|
things are done "right", it's preferable to use the [`merge-pr.sh`] script,
|
|
|
|
|
which does that for you automatically.
|
2019-09-15 03:19:18 +08:00
|
|
|
|
- **use** [`merge-pr.sh`] script to merge PRs. First checkout the target
|
|
|
|
|
branch, usually either `master` or a release dev branch e.g. `v1.17-dev`,
|
|
|
|
|
make sure it's up to date with qTox/qTox, then e.g. `./merge-pr.sh 1234`.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
|
2016-07-06 21:04:30 +08:00
|
|
|
|
You don't have to use it, but then you're running into risk of breaking
|
|
|
|
|
travis build of master & other PRs, since it verifies all commit messages,
|
|
|
|
|
indlucing merge messages.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
|
2016-07-06 21:04:30 +08:00
|
|
|
|
Risk, that can be avoided when one doesn't type manually merge message :wink:
|
|
|
|
|
- **might want** to use [`test-pr.sh`].
|
2016-04-09 04:29:10 +08:00
|
|
|
|
- give a PR some "breathing space" right after it's created – i.e. merging
|
|
|
|
|
something right away can lead to bugs & regressions suddenly popping up, thus
|
|
|
|
|
it's preferable to wait at least a day or so, to let people test & comment on
|
|
|
|
|
the PR before merging.
|
2016-08-06 22:04:04 +08:00
|
|
|
|
- with trivial changes, like fixing typos or something along those lines,
|
|
|
|
|
feel free to merge right away.
|
2019-08-11 06:26:14 +08:00
|
|
|
|
- if a PR requires some changes, comment what parts need to be adjusted,
|
|
|
|
|
preferably by using the `Reviewable` button on the first comment.
|
2016-04-09 04:29:10 +08:00
|
|
|
|
- if PR doesn't apply properly on top of current master (when using
|
2019-08-11 06:26:14 +08:00
|
|
|
|
[`merge-pr.sh`] script), request a rebase
|
2017-01-25 04:28:45 +08:00
|
|
|
|
- if a PR requires changes but there has been no activity from the PR submitter
|
|
|
|
|
for more than 2 months, close the PR.
|
2016-04-09 04:29:10 +08:00
|
|
|
|
|
2020-03-02 01:16:41 +08:00
|
|
|
|
# Continous Integration
|
|
|
|
|
|
|
|
|
|
qTox nightly builds can be found in [qTox-nightly-release]. Should one build
|
2020-03-04 07:06:07 +08:00
|
|
|
|
fail, it is important to restart the whole Travis CI build and not just a
|
|
|
|
|
single job. The tool managing the nightly builds deletes all build artifacts
|
|
|
|
|
on any job failure, so all need to be rebuilt.
|
2016-08-06 22:04:04 +08:00
|
|
|
|
|
2016-04-09 04:29:10 +08:00
|
|
|
|
# Issues
|
|
|
|
|
|
2019-08-11 06:26:14 +08:00
|
|
|
|
## Tagging Issues
|
|
|
|
|
|
|
|
|
|
- When you request more info to be provided in the issue, tag it with
|
|
|
|
|
`O-need-info`. Remove tag once the needed info has been provided.
|
|
|
|
|
- If the needed information is not provided after 30 days, add the `O-stale`
|
|
|
|
|
tag and a comment requesting the information again.
|
|
|
|
|
- If the `O-stale` tag is present for more than 30 day, the issue should
|
|
|
|
|
be closed.
|
|
|
|
|
- If you're going to fix the issue, assign yourself to it.
|
2016-04-09 04:29:10 +08:00
|
|
|
|
- when closing an issue, preferably state the reason why it was closed, unless
|
|
|
|
|
it was closed automatically by commit message.
|
2019-08-11 06:26:14 +08:00
|
|
|
|
- When issue is a duplicate, close the issue with less useful information and
|
|
|
|
|
comment the link to the other issue.
|
|
|
|
|
|
|
|
|
|
## Determining Priority
|
|
|
|
|
|
|
|
|
|
The priority of an issue should be determined by taking into account the user
|
|
|
|
|
impact and how hard it is to fix the issue.
|
|
|
|
|
|
|
|
|
|
### User impact
|
|
|
|
|
|
|
|
|
|
We have two labels to rate user impact `U-high` and `U-low`.
|
|
|
|
|
|
|
|
|
|
Use `U-high` if
|
|
|
|
|
- Many users have reported this issue
|
|
|
|
|
- The problem is triggered often during typical use of qTox
|
|
|
|
|
- The problem causes data loss
|
|
|
|
|
- There is no workaround
|
|
|
|
|
|
|
|
|
|
Use `U-low` if
|
|
|
|
|
- Few users reported this problem
|
|
|
|
|
- The problem occurs very sporadically
|
|
|
|
|
- The problem needs a very specific set of conditions to appear
|
|
|
|
|
- There is a workaround
|
|
|
|
|
- The problem appears only after multiple days of usage
|
|
|
|
|
|
|
|
|
|
### Difficulty to fix
|
|
|
|
|
|
|
|
|
|
We have two labels to estimate the difficulty of a fix, `D-easy` and `D-hard`.
|
|
|
|
|
|
|
|
|
|
Use `D-easy` if you think that:
|
|
|
|
|
- The issue is well described
|
|
|
|
|
- The issue can be consistently reproduced
|
|
|
|
|
- The issue needs no specific equipment to fix, e.g. specific OS, webcam,...
|
|
|
|
|
- The code that causes the problem is known
|
|
|
|
|
|
|
|
|
|
Use `D-hard` if you think that:
|
|
|
|
|
- The issue is described only vaguely
|
|
|
|
|
- The exact way to reproduce the issue is not known
|
|
|
|
|
- The issue happens only on a specifc OS
|
|
|
|
|
- The issue is not only caused by code from qTox
|
|
|
|
|
|
|
|
|
|
### Determining initial priority
|
|
|
|
|
|
|
|
|
|
After assesing the user impact and the difficulty to fix the issue you look up
|
|
|
|
|
the initial priority for the issue in the following table:
|
|
|
|
|
|
|
|
|
|
| | `U-high` | `U-low` |
|
|
|
|
|
|----------|------------|------------|
|
|
|
|
|
| `E-easy` | `P-high` | `P-medium` |
|
|
|
|
|
| `E-hard` | `P-medium` | `P-low` |
|
2016-04-09 04:29:10 +08:00
|
|
|
|
|
2019-08-11 06:26:14 +08:00
|
|
|
|
Possible security issues should be tagged with `P-high` initally. If they are
|
|
|
|
|
confirmed security issues, the tag should be changed to `P-very-high`, else
|
|
|
|
|
apply the normal rating process.
|
2016-04-09 04:29:10 +08:00
|
|
|
|
|
2016-09-19 02:08:18 +08:00
|
|
|
|
# Translations from Weblate
|
|
|
|
|
|
|
|
|
|
Weblate provides an easy way for people to translate qTox. On one hand, it does
|
|
|
|
|
require a bit more attention & regular checking whether there are new
|
|
|
|
|
translations, on the other, it lessened problems that were happening with
|
|
|
|
|
"manual" way of providing translations.
|
|
|
|
|
|
|
|
|
|
To get translations into qTox:
|
|
|
|
|
|
2018-07-02 03:14:18 +08:00
|
|
|
|
1. Go to `https://hosted.weblate.org/projects/tox/qtox/#repository` and lock
|
|
|
|
|
the repository for translations.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
2. Make sure you have git setup to automatically gpg sign commits.
|
|
|
|
|
3. To update translated strings from Weblate, in the root of the qTox
|
|
|
|
|
repository execute the script `tools/update-weblate.sh`
|
|
|
|
|
4. If a new translation language has been added, update the following files:
|
2020-05-21 06:28:16 +08:00
|
|
|
|
- `translations/CMakeLists.txt`
|
2019-04-24 23:37:25 +08:00
|
|
|
|
- `src/widget/form/settings/generalform.cpp`
|
|
|
|
|
- `translations/README.md`
|
|
|
|
|
- `translations/i18n.pri`
|
|
|
|
|
- `translations/translations.qrc`
|
|
|
|
|
5. To update translatable strings from qTox for Weblate, run
|
|
|
|
|
`./tools/update-translation-files.sh ALL`
|
|
|
|
|
6. Checkout a new branch with e.g. `git checkout -b update_weblate` and open
|
2018-07-02 03:14:18 +08:00
|
|
|
|
a Pull Request for it on Github.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
7. After the Pull Request has been merged, `reset` Weblate to master and
|
|
|
|
|
unlock it.
|
2016-09-19 02:08:18 +08:00
|
|
|
|
|
2017-01-05 01:42:58 +08:00
|
|
|
|
# Releases
|
|
|
|
|
|
2017-07-16 20:02:06 +08:00
|
|
|
|
## Tagging scheme
|
|
|
|
|
|
2017-01-05 01:42:58 +08:00
|
|
|
|
- tag versions that are to be released, make sure that they are GPG-signed,
|
|
|
|
|
i.e. `git tag -s v1.8.0`
|
|
|
|
|
- use semantic versions for tags: `vMAJOR.MINOR.PATCH`
|
|
|
|
|
- `MAJOR` – bump version when there are breaking changes to video, audio,
|
|
|
|
|
text chats, groupchats, file transfers, and any other basic functionality.
|
|
|
|
|
For other things, `MINOR` and `PATCH` are to be bumped.
|
|
|
|
|
- `MINOR` – bump version when there are:
|
|
|
|
|
- new features added
|
|
|
|
|
- UI/feature breaking changes
|
|
|
|
|
- other non-breaking changes
|
|
|
|
|
- `PATCH` – bump when there have been only fixes added. If changes include
|
|
|
|
|
something more than just bugfixes, bump `MAJOR` or `MINOR` version
|
|
|
|
|
accordingly.
|
2017-05-13 20:25:54 +08:00
|
|
|
|
- bumping a higher-level version "resets" lower-version numbers, e.g.
|
|
|
|
|
`v1.7.1 → v2.0.0`
|
2017-07-16 20:02:06 +08:00
|
|
|
|
|
|
|
|
|
## Steps for release
|
|
|
|
|
|
|
|
|
|
### Before tagging
|
|
|
|
|
|
2019-05-05 04:48:34 +08:00
|
|
|
|
- Format all code using the [`./tools/format-code.sh`] script
|
2017-07-16 20:02:06 +08:00
|
|
|
|
- Update version number for windows/osx packages using the
|
|
|
|
|
[`./tools/update-versions.sh`] script, e.g. `./tools/update-versions.sh
|
|
|
|
|
1.11.0`
|
2018-08-30 02:27:21 +08:00
|
|
|
|
- Update toxcore version number to the latest tag. Currently this needs to be
|
|
|
|
|
done manually by `grep`ing for the current tag.
|
2019-04-22 16:11:48 +08:00
|
|
|
|
- Update the bootstrap nodelist at `./res/nodes.json` from https://nodes.tox.chat/json.
|
2020-03-24 04:25:08 +08:00
|
|
|
|
This can be done by running [`./tools/update-nodes.sh`]
|
2017-07-16 20:02:06 +08:00
|
|
|
|
- Generate changelog with `clog`.
|
|
|
|
|
- In a `MAJOR`/`MINOR` release tag should include information that changelog
|
2017-01-05 01:42:58 +08:00
|
|
|
|
is located in the `CHANGELOG.md` file, e.g. `For details see CHANGELOG.md`
|
2017-07-16 20:02:06 +08:00
|
|
|
|
- To release a `PATCH` version after non-fix changes have landed on `master`
|
2017-01-05 01:42:58 +08:00
|
|
|
|
branch, checkout latest `MAJOR`/`MINOR` version and `git cherry-pick -x`
|
|
|
|
|
commits from `master` that you want `PATCH` release to include. Once
|
|
|
|
|
cherry-picking has been done, tag HEAD of the branch.
|
2017-07-16 20:02:06 +08:00
|
|
|
|
- When making a `PATCH` tag, include in tag message short summary of what the
|
2017-01-05 01:42:58 +08:00
|
|
|
|
tag release fixes, and to whom it's interesting (often only some
|
|
|
|
|
OSes/distributions would find given `PATCH` release interesting).
|
2017-07-16 20:02:06 +08:00
|
|
|
|
|
|
|
|
|
### After tagging
|
|
|
|
|
|
2018-08-28 10:11:31 +08:00
|
|
|
|
- Create and GPG-sign the tar.lz and tar.gz archives using
|
|
|
|
|
[`./tools/create-tarballs.sh`] script, and upload both archives plus both
|
|
|
|
|
signature files to the github release that was created by a Travis OSX
|
2017-07-16 20:02:06 +08:00
|
|
|
|
release job.
|
2018-04-23 04:51:46 +08:00
|
|
|
|
- Update download links on https://tox.chat to point to the new release.
|
2018-08-28 10:11:31 +08:00
|
|
|
|
- Write a short blog post for https://github.com/qTox/blog/ and advertise the
|
|
|
|
|
post on Tox IRC channels, popular Tox groups, reddit, or whatever other platforms.
|
2019-04-24 23:37:25 +08:00
|
|
|
|
- Open a PR to update the Flatpak manifest of our [Flathub repository] with the
|
2018-07-18 21:52:48 +08:00
|
|
|
|
changes from [`./flatpak/io.github.qtox.qTox.json`].
|
|
|
|
|
- Comment to the PR with `bot, build` to execute a test build
|
|
|
|
|
- After the build passed for qTox on all architectures on
|
|
|
|
|
[the Flathub build bot], merge the PR into the master branch of our
|
|
|
|
|
[Flathub repository].
|
2017-01-05 01:42:58 +08:00
|
|
|
|
|
|
|
|
|
|
2016-08-06 22:04:04 +08:00
|
|
|
|
# How to become a maintainer?
|
|
|
|
|
|
|
|
|
|
Contribute, review & test pull requests, be active, oh and don't forget to
|
|
|
|
|
mention that you would want to become a maintainer :P
|
|
|
|
|
|
|
|
|
|
Aside from contents of [`CONTRIBUTING.md`] you should also know the contents of
|
|
|
|
|
this file.
|
|
|
|
|
|
|
|
|
|
Once you're confident about your knowledge and you've been around the project
|
|
|
|
|
helping for a while, ask to be added to the `qTox` organization on GitHub.
|
|
|
|
|
|
|
|
|
|
|
2016-04-09 04:29:10 +08:00
|
|
|
|
[commit message format]: /CONTRIBUTING.md#commit-message-format
|
2016-08-06 22:04:04 +08:00
|
|
|
|
[`CONTRIBUTING.md`]: /CONTRIBUTING.md
|
2016-04-09 04:29:10 +08:00
|
|
|
|
[`merge-pr.sh`]: /merge-pr.sh
|
2016-07-06 21:04:30 +08:00
|
|
|
|
[`test-pr.sh`]: /test-pr.sh
|
2016-11-05 17:33:49 +08:00
|
|
|
|
[`./tools/deweblate-translation-file.sh`]: /tools/deweblate-translation-file.sh
|
2017-01-05 01:42:58 +08:00
|
|
|
|
[`./tools/create-tarball.sh`]: /tools/create-tarball.sh
|
2020-03-24 04:25:08 +08:00
|
|
|
|
[`./tools/update-nodes.sh`]: /tools/update-nodes.sh
|
2017-02-11 13:52:06 +08:00
|
|
|
|
[`./tools/update-versions.sh`]: /tools/update-versions.sh
|
2019-05-05 04:48:34 +08:00
|
|
|
|
[`./tools/format-code.sh`]: /tools/format-code.sh
|
2018-07-18 21:52:48 +08:00
|
|
|
|
[Flathub repository]: https://github.com/flathub/io.github.qtox.qTox
|
|
|
|
|
[`./flatpak/io.github.qtox.qTox.json`]: flatpak/io.github.qtox.qTox.json
|
|
|
|
|
[the Flathub build bot]: https://flathub.org/builds/#/
|
2020-03-02 01:16:41 +08:00
|
|
|
|
[qTox-nightly-release]: https://github.com/qTox/qTox-nightly-releases
|