Merge pull request #2112 from conda-forge/remove-automerge

conda_smithy/configure_feedstock.py

@@ -2167,9 +2167,23 @@ def _get_skip_files(forge_config):
 
 
 def render_github_actions_services(jinja_env, forge_config, forge_dir):
-    # render github actions files for automerge and rerendering services
     skip_files = _get_skip_files(forge_config)
-    for template_file in ["automerge.yml"]:
+
+    # we always remove the old files if they exist
+    old_github_actions_files = [
+        "automerge.yml",
+        "webservices.yml",
+    ]
+    for filename in old_github_actions_files:
+        rel_target_fname = os.path.join(".github", "workflows", filename)
+        if _ignore_match(skip_files, rel_target_fname):
+            continue
+        remove_file(rel_target_fname)
+
+    # there are no current services to render, but if we add them in the future,
+    # they can go here
+    current_github_actions_files = []
+    for template_file in current_github_actions_files:
         template = jinja_env.get_template(template_file + ".tmpl")
         rel_target_fname = os.path.join(".github", "workflows", template_file)
         if _ignore_match(skip_files, rel_target_fname):

news/2112-remove-GHA-services.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* Moved automerge to a central repository. (#2112)
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Rerendering now removes old GHA service files. (#2112)
+
+**Security:**
+
+* <news item>

tests/test_configure_feedstock.py

@@ -793,23 +793,6 @@ def test_choco_install(choco_recipe, jinja_env):
     assert exp in contents
 
 
-def test_automerge_action_exists(py_recipe, jinja_env):
-    configure_feedstock.render_github_actions_services(
-        jinja_env=jinja_env,
-        forge_config=py_recipe.config,
-        forge_dir=py_recipe.recipe,
-    )
-    assert os.path.exists(
-        os.path.join(py_recipe.recipe, ".github/workflows/automerge.yml")
-    )
-    with open(
-        os.path.join(py_recipe.recipe, ".github/workflows/automerge.yml")
-    ) as f:
-        action_config = yaml.safe_load(f)
-    assert "jobs" in action_config
-    assert "automerge-action" in action_config["jobs"]
-
-
 def test_conda_forge_yaml_empty(config_yaml: ConfigYAML):
     load_forge_config = lambda: configure_feedstock._load_forge_config(  # noqa
         config_yaml.workdir,