From 502d2f55c74c95650be803022ed921bda2cb828f Mon Sep 17 00:00:00 2001 From: jaimergp Date: Fri, 4 Oct 2024 00:20:39 +0200 Subject: [PATCH 1/2] Bump Azure to macOS 13 --- conda_smithy/data/conda-forge.json | 18 +++--------------- conda_smithy/data/conda-forge.yml | 2 +- conda_smithy/schema.py | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/conda_smithy/data/conda-forge.json b/conda_smithy/data/conda-forge.json index c79edbc8d..621bc1e55 100644 --- 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 index e00e084f0..b6c86356d 100644 --- 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 index 2bd56947b..d17754a4e 100644 --- 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", ) From 0c3cc358f5684d875904443b17fd82b5c41492f4 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Fri, 4 Oct 2024 00:22:09 +0200 Subject: [PATCH 2/2] add news --- news/2078-macos-13.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/2078-macos-13.rst diff --git a/news/2078-macos-13.rst b/news/2078-macos-13.rst new file mode 100644 index 000000000..938b28024 --- /dev/null +++ b/news/2078-macos-13.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* Bump Azure's ``vmImage`` to ``macOS-13``. (#2078) + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +*