From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Updates to documentation
Date: Wed, 08 Jul 2020 21:45:44 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23475@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages contributing-new
https://github.com/void-linux/void-packages/pull/23475
Updates to documentation
- more commit examples and better explanation to PR process
- use local links instead of github ones for files inside the repo
Closed #21609 in favor of this one, to speed up acceptance.
A patch file from https://github.com/void-linux/void-packages/pull/23475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-contributing-new-23475.patch --]
[-- Type: text/x-diff, Size: 6908 bytes --]
From 1f26bfacceb3d50e8be00f982910c8e33f5ed654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 May 2020 20:21:45 -0300
Subject: [PATCH 1/3] CONTRIBUTING.md: add commit examples and expl. to PR
process
- Add commit examples for package removal and shlibs modifications
- Explain the PR process, specially when related to soname bumps
- Explain [ci skip]
---
CONTRIBUTING.md | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0490b5f11c2..20024274a94 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,7 +43,14 @@ Once you have built your template file or files, the commit message should have
* for template modifications without a version change, use ```<pkgname>: <reason>``` ([example](https://github.com/void-linux/void-packages/commit/8b68d6bf1eb997cd5e7c095acd040e2c5379c91d)).
+* for package removals, use ```<pkgname>: remove package``` ([example](https://github.com/void-linux/void-packages/commit/83784632d94deee5d038c8e1c4c1dffa922fca21)).
+
+* for `common/shlibs` modifications, use `common/shlibs: <pkgname>` ([example](https://github.com/void-linux/void-packages/commit/613651c91811cb4fd2e1a6be701c87072d759a9f)).
+
If you want to describe your changes in more detail, add an empty line followed by those details ([example](https://github.com/void-linux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6)).
+Pull requests with changes to packages that take too long to build, such as Firefox and the Linux kernel, should include `[ci skip]` in the last line of the commits, to avoid unnecessarily
+spending the CI builders' time, since the package is not going to finish building under the 50 minute limit.
+In such cases, the package should be built and cross-built locally for a combination of architectures and libc.
For further information, please consult the [manual](https://github.com/void-linux/void-packages/blob/master/Manual.md).
@@ -69,8 +76,8 @@ Once you have successfully built the package, you can start a pull request.
Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
-If you make updates to packages containing a soname bump you also need to revbump all packages that are dependant. Those
-packages should also be part of the same pull request.
+If you make updates to packages containing a soname bump, you also need to update `common/shlibs` and revbump all packages that are dependant.
+There should be a commit for each package revbump, and those commits should be part of the same pull request.
When you make changes to your pull request, please *do not close and reopen your pull request*. Instead, just forcibly git push, overwriting any old commits. Closing and opening your pull requests repeatedly spams the Void maintainers.
From faa123e10a1ea669a8b96f9037fcd789a6d0af62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 May 2020 20:29:38 -0300
Subject: [PATCH 2/3] CONTRIBUTING.md: use local links instead of GH ones
---
CONTRIBUTING.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 20024274a94..c2a4c14a67d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,9 +8,8 @@ This document describes how you, as a contributor, can help with adding packages
If you really want to get a package into Void Linux, we recommend you package it yourself.
-We provide a [comprehensive Manual](https://github.com/void-linux/void-packages/blob/master/Manual.md)
-on how to create new packages. There's also a
-[manual for xbps-src](https://github.com/void-linux/void-packages/blob/master/README.md), which is used
+We provide a [comprehensive Manual](./Manual.md) on how to create new packages.
+There's also a [manual for xbps-src](./README.md), which is used
to build package files from templates.
For this guide, we assume you have basic knowledge about [git](http://git-scm.org), as well as a [GitHub Account](http://github.com).
@@ -25,7 +24,7 @@ You can use the helper tool `xnew`, from the [xtools](https://github.com/chneuki
Templates must have the name `void-packages/srcpkgs/<pkgname>/template`, where `pkgname` is the same as the `pkgname` variable in the template.
-For deeper insights on the contents of template files, please read the [manual](https://github.com/void-linux/void-packages/blob/master/Manual.md), and be sure to browse the existing template files in the `srcpkgs` directory of this repository for concrete examples.
+For deeper insights on the contents of template files, please read the [manual](./Manual.md), and be sure to browse the existing template files in the `srcpkgs` directory of this repository for concrete examples.
When you've finished working on the template file, please check it with `xlint` helper from the [xtools](https://github.com/chneukirchen/xtools) package:
From b6c9e92208495d38b3f8d23bcd896b74ef8a5549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 8 Jul 2020 16:40:46 -0300
Subject: [PATCH 3/3] README, Manual: use local links for files in repo.
---
Manual.md | 5 ++---
README.md | 6 ++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Manual.md b/Manual.md
index 10082b68da5..71246910a12 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1963,9 +1963,8 @@ Fork the voidlinux `void-packages` git repository on github and clone it:
$ git clone git@github.com:<user>/void-packages.git
-See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md)
-for information on how to format your commits and other tips for
-contributing.
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to format your
+commits and other tips for contributing.
Once you've made changes to your `forked` repository you can submit
a github pull request; see https://help.github.com/articles/fork-a-repo for more information.
diff --git a/README.md b/README.md
index 7cb3895e6f2..fe85e3f20eb 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,8 @@ The included `xbps-src` script will fetch and compile the sources, and install i
files into a `fake destdir` to generate XBPS binary packages that can be installed
or queried through the `xbps-install(1)` and `xbps-query(1)` utilities, respectively.
-See [Contributing](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md)
-for a general overview of how to contribute and the
-[Manual](https://github.com/void-linux/void-packages/blob/master/Manual.md)
-for details of how to create source packages.
+See [Contributing](./CONTRIBUTING.md) for a general overview of how to contribute and the
+[Manual](./Manual.md) for details of how to create source packages.
### Table of Contents
next reply other threads:[~2020-07-08 19:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 19:45 ericonr [this message]
2020-07-09 23:24 ` [PR REVIEW] " ahesford
2020-07-09 23:43 ` ericonr
2020-07-10 3:46 ` ahesford
2020-07-10 4:10 ` [PR PATCH] [Updated] " ericonr
2020-07-10 4:10 ` [PR REVIEW] " ericonr
2020-07-11 19:44 ` Chocimier
2020-07-11 19:44 ` Chocimier
2020-07-11 19:44 ` Chocimier
2020-07-11 20:08 ` ahesford
2020-07-11 22:34 ` ericonr
2020-07-12 3:37 ` ahesford
2020-07-12 13:58 ` [PR PATCH] [Updated] " ericonr
2020-07-12 13:58 ` ericonr
2020-07-13 16:21 ` [PR PATCH] [Merged]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23475@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).