Skip to content

Commit 06c60da

Browse files
authored
Merge pull request #1459 from conda-forge/add-user
DOC add docs for user command
2 parents a020fbc + ef7d331 commit 06c60da

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

src/maintainer/infrastructure.rst

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,17 @@ Entering this command in the title of an issue will instruct the admin bot to
151151
add Python 2.7 back to a feedstock. Note that this command will remove any other
152152
Python versions and any ``win``, ``aarch64`` or ``ppc64le`` builds. Thus you should
153153
merge the PR into a separate branch on your feedstock if you want to keep these
154-
other builds. **Python 2.7 support is deprecated and any feedstocks on Python 2.7 will
154+
other builds. **Python 2.7 support is deprecated and any feedstocks on Python 2.7 will
155155
not be properly handled by our bots.**
156156

157+
@conda-forge-admin, please add <@user>
158+
--------------------------------------
159+
160+
Entering the above phrase in the title of an issue on a feedstock will make a PR
161+
that adds the given user to the feedstock. A maintainer or member of ``core`` can then merge
162+
this PR to add the user. Please do not modify this PR or adjust the commit message. This
163+
PR is designed to skip building the package.
164+
157165

158166
CI build services
159167
=================
@@ -162,8 +170,8 @@ Here we describe common issues with the CI Services that conda-forge builds.
162170

163171
Azure Pipelines
164172
---------------
165-
Azure is used to build packages for OSX, Linux (x86_64, native), Linux (ARMv8, emulated) and Linux (IBM Power8+, emulated).
166-
The build queue on Azure is substantially larger than on all the other providers.
173+
Azure is used to build packages for OSX, Linux (x86_64, native), Linux (ARMv8, emulated) and Linux (IBM Power8+, emulated).
174+
The build queue on Azure is substantially larger than on all the other providers.
167175
Azure builds have a maximum duration of 6 hours.
168176

169177
To see all builds on Azure, visit `<https://dev.azure.com/conda-forge/feedstock-builds/_build>`_.
@@ -195,7 +203,7 @@ TravisCI (OSX, IBM Power 8+)
195203
------------------------------
196204

197205
TravisCI is used to build packages for IBM Power 8+. After merging a staged-recipes pull request, it might be necessary to
198-
force sync your repositories in TravisCI to see the reload and cancel buttons. To do this please visit `<https://travis-ci.com/profile>`_
206+
force sync your repositories in TravisCI to see the reload and cancel buttons. To do this please visit `<https://travis-ci.com/profile>`_
199207
and click "Sync accounts".
200208

201209
Enabling Travis
@@ -209,7 +217,7 @@ Enable a build by adding the following to ``conda-forge.yml`` in the root of the
209217
210218
provider:
211219
osx: travis
212-
220+
213221
For IBM Power 8+ builds, add the name of your feedstock to the list `here
214222
<https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`_
215223
via a pull request.
@@ -270,15 +278,15 @@ Otherwise (e.g. in a PR to staged-recipes), here are some things you can try:
270278
Drone.io
271279
--------
272280

273-
We use `Drone.io <https://drone.io>`_ for Linux ARMv8 builds. To enable these builds on your feedstock, make a pull request to add your feedstock to the list
281+
We use `Drone.io <https://drone.io>`_ for Linux ARMv8 builds. To enable these builds on your feedstock, make a pull request to add your feedstock to the list
274282
here `<https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`_.
275283

276284

277285
GitHub Actions
278286
--------------
279287

280-
We use GitHub actions to rerender feedstocks and also run our pull request automerge service. We do not currently support builds on
281-
GitHub Actions.
288+
We use GitHub actions to rerender feedstocks and also run our pull request automerge service. We do not currently support builds on
289+
GitHub Actions.
282290

283291

284292
Skipping CI builds
@@ -295,9 +303,9 @@ To skip a CI build for a given commit, put ``[ci skip] ***NO_CI***`` in the comm
295303
Third-party Use of Our CI Services
296304
----------------------------------
297305

298-
Due to its stature in the open-source community, conda-forge has enhanced access to certain CI services. This access is a community
299-
resource entrusted to conda-forge for use in building packages. We thus cannot support third-party or "off-label" CI jobs in our
300-
feedstocks on any of our CI services. If we find such use, we will politely ask the maintainers to rectify the situation. We may
306+
Due to its stature in the open-source community, conda-forge has enhanced access to certain CI services. This access is a community
307+
resource entrusted to conda-forge for use in building packages. We thus cannot support third-party or "off-label" CI jobs in our
308+
feedstocks on any of our CI services. If we find such use, we will politely ask the maintainers to rectify the situation. We may
301309
take more serious actions, including archiving feedstocks or removing maintainers from the organization, if the situation cannot be rectified.
302310

303311

0 commit comments

Comments
 (0)