From 342b573d45bf87d9e13685d03f221af261ea30e5 Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Thu, 9 Feb 2023 12:41:43 +0800 Subject: [PATCH] Remove vendor docs (#534) As title, we no longer use vendoring (or dep!). Also updated the link to Discord. Co-authored-by: jolheiser Reviewed-on: https://gitea.com/gitea/tea/pulls/534 Reviewed-by: techknowlogick Co-authored-by: John Olheiser Co-committed-by: John Olheiser --- CONTRIBUTING.md | 19 ++----------------- README.md | 1 - 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 498d474..fe6e7c0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,6 @@ - [Bug reports](#bug-reports) - [Discuss your design](#discuss-your-design) - [Testing redux](#testing-redux) - - [Vendoring](#vendoring) - [Code review](#code-review) - [Styleguide](#styleguide) - [Sign-off your work](#sign-off-your-work) @@ -60,20 +59,6 @@ high-level discussions. Before sending code out for review, run all the test by executing: `make test` Since TEA is an cli tool it should be obvious to test your feature locally first. -## Vendoring - -We keep a cached copy of dependencies within the `vendor/` directory, -managing updates via [dep](https://github.com/golang/dep). - -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 [dep project website](https://golang.github.io/dep/docs/introduction.html). - ## Code review Changes to TEA must be reviewed before they are accepted—no matter who @@ -175,7 +160,7 @@ 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 +[Discord](https://discord.gg/Gitea) #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 @@ -208,7 +193,7 @@ https://help.github.com/articles/securing-your-account-with-two-factor-authentic 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 +[Discord](https://discord.gg/Gitea) #general channel. Below are the words to speak: ``` diff --git a/README.md b/README.md index 6c90e05..19811e9 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,6 @@ Fork -> Patch -> Push -> Pull Request - `make test` run testsuite - `make vet` run checks (check the order of imports; preventing failure on CI pipeline beforehand) -- `make vendor` when adding new dependencies - ... (for other development tasks, check the `Makefile`) **Please** read the [CONTRIBUTING](CONTRIBUTING.md) documentation, it will tell you about internal structures and concepts.