From f25e3520ac2b106d6067689f1fce124e145b79f7 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Sat, 25 Jul 2020 15:59:06 -0400 Subject: [PATCH 1/3] add announcement about automerge by default for rebuilds --- src/user/announcements.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/user/announcements.rst b/src/user/announcements.rst index cfc7d8acfd..3c89484c74 100644 --- a/src/user/announcements.rst +++ b/src/user/announcements.rst @@ -3,6 +3,18 @@ Announcements 2020 ---- +:2020-07-27: Automerge bot rebuild PRs by default + + In two weeks we will set all new bot PRs for rebuilding packages (eg for a new version of boost) + to automatically merge once they pass the CI and linter, by default. + This will enable migrations to go much faster and will reduce maintainance burden. + If you maintain a package where this could be detrimental please add + ``bot: automerge: False`` or ``bot: automerge: version`` to the ``conda-forge.yaml``. + ``False`` will tell the bot to never automerge and ``version`` will only automerge for + version bump PRs. + If you have any issues or concerns please contact the bot team via ``@conda-forge/bot`` or + on the `bot gitter `_. + Note that this doesn't cause PRs which have already been issued to be automerged. :2020-07-23: Strict channel priority in builds for OSX and Linux From e452e5051a4931a857717846e021de3822673719 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Sat, 25 Jul 2020 15:59:59 -0400 Subject: [PATCH 2/3] spelling --- src/user/announcements.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/announcements.rst b/src/user/announcements.rst index 3c89484c74..b949a8fe08 100644 --- a/src/user/announcements.rst +++ b/src/user/announcements.rst @@ -7,7 +7,7 @@ Announcements In two weeks we will set all new bot PRs for rebuilding packages (eg for a new version of boost) to automatically merge once they pass the CI and linter, by default. - This will enable migrations to go much faster and will reduce maintainance burden. + This will enable migrations to go much faster and will reduce maintenance burden. If you maintain a package where this could be detrimental please add ``bot: automerge: False`` or ``bot: automerge: version`` to the ``conda-forge.yaml``. ``False`` will tell the bot to never automerge and ``version`` will only automerge for From f2a5459f7e8c7a39bc530d7553e3744743680a08 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Sat, 25 Jul 2020 16:00:54 -0400 Subject: [PATCH 3/3] yml not yaml --- src/user/announcements.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/announcements.rst b/src/user/announcements.rst index b949a8fe08..bb3348ee06 100644 --- a/src/user/announcements.rst +++ b/src/user/announcements.rst @@ -9,7 +9,7 @@ Announcements to automatically merge once they pass the CI and linter, by default. This will enable migrations to go much faster and will reduce maintenance burden. If you maintain a package where this could be detrimental please add - ``bot: automerge: False`` or ``bot: automerge: version`` to the ``conda-forge.yaml``. + ``bot: automerge: False`` or ``bot: automerge: version`` to the ``conda-forge.yml``. ``False`` will tell the bot to never automerge and ``version`` will only automerge for version bump PRs. If you have any issues or concerns please contact the bot team via ``@conda-forge/bot`` or