Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Azure to macOS 13 #2078

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Bump Azure to macOS 13 #2078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
502d2f5
Bump Azure to macOS 13
jaimergp Oct 3, 2024
0c3cc35
add news
jaimergp Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions conda_smithy/data/conda-forge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion conda_smithy/data/conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ azure:
variables: {}
settings_osx:
pool:
vmImage: macOS-12
vmImage: macOS-13
swapfile_size: null
timeoutInMinutes: 360
variables: {}
Expand Down
2 changes: 1 addition & 1 deletion conda_smithy/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
Expand Down
23 changes: 23 additions & 0 deletions news/2078-macos-13.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading