Skip to content

Commit 1c16724

Browse files
authored
Merge branch 'main' into 2023-04-19-meeting-notes
2 parents 174d57d + 2d27a2f commit 1c16724

File tree

5 files changed

+17
-85
lines changed

5 files changed

+17
-85
lines changed

src/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
r'https://app.element.io/#/room/#conda-forge-space:matrix.org', # needs login
132132
r'https://anacondacon.io/.*$', # website is gone
133133
r'https://matrix.to/#.*$', # anchors are generated dynamically
134+
r'https://app.element.io/#.*$', # anchors are generated dynamically
134135
r'https://wave.webaim.org/report#.*$', # anchors are generated dynamically
135136
] + anchor_check_fps
136137

src/maintainer/infrastructure.rst

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@ Note that this update command is kind of a hack, and things might go wrong. Make
101101

102102
Entering the above phrase in a PR of a feedstock will lint the PR again.
103103

104-
.. _ci_update_circle:
105-
106-
@conda-forge-admin, please update circle
107-
----------------------------------------
108-
109-
Entering the above phrase in an issue of a feedstock will update the Circle-CI SSH deploy key. This will fix the
110-
``permission denied (public key)`` issue in Circle-CI's checkout phase; it shouldn't be needed otherwise.
111-
112104

113105
@conda-forge-admin, please update team
114106
--------------------------------------
@@ -202,10 +194,10 @@ of the feedstock.
202194
certain very old packages that require VC9 will fail.
203195

204196

205-
TravisCI (OSX, IBM Power 8+)
197+
TravisCI (IBM Power 8+, ARM)
206198
------------------------------
207199

208-
TravisCI is used to build packages for IBM Power 8+. After merging a staged-recipes pull request, it might be necessary to
200+
TravisCI is used to build packages for IBM Power 8+ and ARM. After merging a staged-recipes pull request, it might be necessary to
209201
force sync your repositories in TravisCI to see the reload and cancel buttons. To do this please visit `<https://app.travis-ci.com/account/repositories>`__
210202
and click the "Sync accounts" button.
211203

@@ -221,64 +213,11 @@ Enable a build by adding the following to ``conda-forge.yml`` in the root of the
221213
provider:
222214
osx: travis
223215
224-
For IBM Power 8+ builds, add the name of your feedstock to the list `here
216+
For IBM Power 8+ and/or ARM builds, add the name of your feedstock to the list `here
225217
<https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`__
226218
via a pull request.
227219

228220

229-
CircleCI (Linux, OSX)
230-
----------------------
231-
CircleCI is a container-based CI service that conda-forge uses to build
232-
Linux packages. It can optionally build OSX packages.
233-
234-
Linux builds are identical to those on Azure as both are built inside Docker containers.
235-
236-
237-
Using Circle for both Linux and OSX
238-
....................................
239-
240-
To use CircleCI for OSX, add the following to ``conda-forge.yml`` in the root of the feedstock.
241-
242-
.. code-block:: yaml
243-
244-
provider:
245-
osx: circle
246-
linux: circle
247-
248-
CircleCI for OSX should be used for OSX, only when TravisCI resources (50 minutes of build time per job) are not enough as CircleCI gives more resources (2 hours of build time per job).
249-
250-
Note that you need to rerender the feedstock, once this change has been made.
251-
252-
253-
Debugging permission errors
254-
...........................
255-
256-
If CircleCI lacks permissions to checkout the source code, it will produce an error as follows::
257-
258-
Cloning into '.'...
259-
Warning: Permanently added the RSA host key for IP address '192.30.253.113' to the list of known hosts.
260-
Permission denied (publickey).
261-
fatal: Could not read from remote repository.
262-
263-
When this happens for a feedstock, it can be fixed using the `webservice <ci_update_circle>`, by posting the following comment::
264-
265-
@conda-forge-admin, please update circle
266-
267-
Otherwise (e.g. in a PR to staged-recipes), here are some things you can try:
268-
269-
* Log in and out of Circle CI.
270-
* Revoke CircleCI's access and then enable it again.
271-
* In the "Checkout SSH keys" section of your Circle CI project settings, press "add user key".
272-
273-
274-
Drone.io
275-
--------
276-
277-
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
278-
in the `arch_rebuild.txt file <https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/arch_rebuild.txt>`__.
279-
Read :ref:`using_arch_rebuild` to learn more.
280-
281-
282221
GitHub Actions
283222
--------------
284223

src/maintainer/maintainer_faq.rst

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
11
FAQ
22
===
33

4-
.. _mfaq_update_circle:
5-
6-
:ref:`(Q) <mfaq_update_circle>` **How to address** ``permission denied (publickey)`` **in circle builds?**
7-
8-
When you see this error in a circle build:
9-
::
10-
11-
Permission denied (publickey).
12-
13-
fatal: Could not read from remote repository.
14-
15-
Please make sure you have the correct access rights
16-
and the repository exists.
17-
Exited with code 128
18-
19-
Open a new issue with a comment :ref:`ci_update_circle`.
20-
Once our web services have updated the circle configuration, restart the build.
21-
22-
234
.. _mfaq_py37_selector:
245

256
:ref:`(Q) <mfaq_py37_selector>` **Why does conda-build ignore the** ``py37`` **selector in meta.yaml?**

src/orga/getting-in-touch.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The main issue trackers that you will interact with are
1414
* `Our main docs repo <https://github.com/conda-forge/conda-forge.github.io/issues>`__: You'll use this repo as a catch-all for issues where you're not sure where else to put them
1515
* `Our enhancement proposals repo <https://github.com/conda-forge/cfep/issues>`__: You'll use the enhancement proposals repo if you're interested in substantially changing the way conda-forge operates.
1616

17-
Gitter
18-
-----------------
17+
Gitter and Element
18+
-------------------------
1919

2020
The main chat rooms that you'll interact with are
2121

@@ -26,6 +26,11 @@ The main chat rooms that you'll interact with are
2626
* `gitter: bot subteam <https://gitter.im/conda-forge/regro-cf-autotick-bot>`__: Public chat room for all things related to the conda-forge automation infrastructure.
2727
Our automation infrastructure is colloquially referred to as "the bot".
2828
* `gitter: compilers <https://gitter.im/conda-forge/conda-forge-compilers>`__: Public chat room focused on the conda-forge compiler stack.
29+
* `element: conda-forge-space <https://app.element.io/#/room/#conda-forge-space:matrix.org>`__: An element space listing all conda-forge rooms.
30+
* `element: interns <https://app.element.io/#/room/#conda-forge_conda-forge-interns:gitter.im>`__: Public chat room for conda-forge interns to discuss projects and seek guidance from the community.
31+
* `element: general <https://app.element.io/#/room/#conda-forge:matrix.org>`__: Public chat room for the conda-forge community to discuss anything related to conda-forge.
32+
33+
Note: All Gitter room links forward to Element
2934

3035
Mailing List
3136
-----------------

src/user/tipsandtricks.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ the local version matches the ``conda`` version within the proper ABI range, the
101101
work. At runtime, the ``conda-forge`` package that depends on MPI should find the
102102
local copy of ``mpich``/``openmpi`` and link to it.
103103

104+
Another point for using your own MPI binaries specialized for the system is that
105+
if you care about ultimate performance, you should build/install your MPI backend yourself,
106+
and not rely on ``conda-forge`` packages (they are built for compatibility rather than performance).
107+
Due to the constrained build environment of ``conda-forge`` packages there might be the lack of such important features
108+
as XPMEM and CMA for ``mpich`` and ``openmpi``, respectively.
109+
104110

105111
.. _apple_silicon_rosetta:
106112

0 commit comments

Comments
 (0)