Merge pull request #2078 from jaimergp/macos-13

conda-forge · Oct 3, 2024 · 1630451 · 1630451
2 parents 5817e63 + 0c3cc35
commit 1630451
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/conda_smithy/data/conda-forge.json b/conda_smithy/data/conda-forge.json
@@ -110,27 +110,15 @@
           "title": "Upload Packages"
         },
         "settings_linux": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/AzureRunnerSettings"
-            }
-          ],
+          "$ref": "#/$defs/AzureRunnerSettings",
           "description": "Linux-specific settings for runners"
         },
         "settings_osx": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/AzureRunnerSettings"
-            }
-          ],
+          "$ref": "#/$defs/AzureRunnerSettings",
           "description": "OSX-specific settings for runners"
         },
         "settings_win": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/AzureRunnerSettings"
-            }
-          ],
+          "$ref": "#/$defs/AzureRunnerSettings",
           "description": "Windows-specific settings for runners"
         },
         "user_or_org": {

diff --git a/conda_smithy/data/conda-forge.yml b/conda_smithy/data/conda-forge.yml
@@ -15,7 +15,7 @@ azure:
     variables: {}
   settings_osx:
     pool:
-      vmImage: macOS-12
+      vmImage: macOS-13
     swapfile_size: null
     timeoutInMinutes: 360
     variables: {}

diff --git a/conda_smithy/schema.py b/conda_smithy/schema.py
@@ -198,7 +198,7 @@ class AzureConfig(BaseModel):
 
     settings_osx: AzureRunnerSettings = Field(
         default_factory=lambda: AzureRunnerSettings(
-            pool={"vmImage": "macOS-12"}
+            pool={"vmImage": "macOS-13"}
         ),
         description="OSX-specific settings for runners",
     )

diff --git a/news/2078-macos-13.rst b/news/2078-macos-13.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* Bump Azure's ``vmImage`` to ``macOS-13``. (#2078)
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>