Merge branch 'main' into micromamba-cache-windows

conda-forge · Oct 30, 2024 · 25cb91a · 25cb91a
2 parents 92312b5 + a47f077
commit 25cb91a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py
@@ -79,6 +79,9 @@
     "conda-forge-tick",
     "conda-forge-feedstock-check-solvable-feedstock",
     "conda-forge-metadata-feedstock",
+    "conda-forge-feedstock-ops-feedstock",
+    # this one is used for testing
+    "cf-autotick-bot-test-package-feedstock",
 ]
 if "CONDA_SMITHY_SERVICE_FEEDSTOCKS" in os.environ:
     SERVICE_FEEDSTOCKS += os.environ["CONDA_SMITHY_SERVICE_FEEDSTOCKS"].split(

diff --git a/news/2106-more-service-feedstocks.rst b/news/2106-more-service-feedstocks.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* Added more service feedstocks allowed to use GHA. (#2106)
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>