Skip to content

Commit 4eefbff

Browse files
authored
Use macos-15-intel runners instead of arm macos-15 (#4811)
1 parent def18b4 commit 4eefbff

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/generate-ci/gen_ci.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ envVars arch os = object $
190190
runner :: Arch -> Opsys -> [Value]
191191
runner Amd64 (Linux _) = ["ubuntu-latest"]
192192
runner AArch64 (Linux _) = ["ubuntu-22.04-arm"]
193-
runner Amd64 Darwin = ["macOS-15"]
193+
runner Amd64 Darwin = ["macOS-15-intel"]
194194
runner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
195195
runner Amd64 Windows = ["windows-latest"]
196196
runner AArch64 Windows = error "aarch64 windows not supported"
@@ -199,7 +199,7 @@ runner AArch64 Windows = error "aarch64 windows not supported"
199199
bindistRunner :: Arch -> Opsys -> [Value]
200200
bindistRunner Amd64 (Linux _) = ["self-hosted", "linux-space", "maerwald"]
201201
bindistRunner AArch64 (Linux _) = ["self-hosted", "Linux", "ARM64", "maerwald"]
202-
bindistRunner Amd64 Darwin = ["macOS-15"]
202+
bindistRunner Amd64 Darwin = ["macOS-15-intel"]
203203
bindistRunner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
204204
bindistRunner Amd64 Windows = ["windows-latest"]
205205
bindistRunner AArch64 Windows = error "aarch64 windows not supported"

.github/workflows/release.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ jobs:
10011001
- build-x86_64-mac-9122
10021002
- build-x86_64-mac-9141
10031003
runs-on:
1004-
- macOS-15
1004+
- macOS-15-intel
10051005
steps:
10061006
- name: Checkout
10071007
uses: actions/checkout@v4
@@ -3455,7 +3455,7 @@ jobs:
34553455
environment: CI
34563456
name: build-x86_64-mac-9103 (Build binaries)
34573457
runs-on:
3458-
- macOS-15
3458+
- macOS-15-intel
34593459
steps:
34603460
- name: Checkout
34613461
uses: actions/checkout@v4
@@ -3488,7 +3488,7 @@ jobs:
34883488
environment: CI
34893489
name: build-x86_64-mac-9122 (Build binaries)
34903490
runs-on:
3491-
- macOS-15
3491+
- macOS-15-intel
34923492
steps:
34933493
- name: Checkout
34943494
uses: actions/checkout@v4
@@ -3521,7 +3521,7 @@ jobs:
35213521
environment: CI
35223522
name: build-x86_64-mac-9141 (Build binaries)
35233523
runs-on:
3524-
- macOS-15
3524+
- macOS-15-intel
35253525
steps:
35263526
- name: Checkout
35273527
uses: actions/checkout@v4
@@ -3554,7 +3554,7 @@ jobs:
35543554
environment: CI
35553555
name: build-x86_64-mac-967 (Build binaries)
35563556
runs-on:
3557-
- macOS-15
3557+
- macOS-15-intel
35583558
steps:
35593559
- name: Checkout
35603560
uses: actions/checkout@v4
@@ -3587,7 +3587,7 @@ jobs:
35873587
environment: CI
35883588
name: build-x86_64-mac-984 (Build binaries)
35893589
runs-on:
3590-
- macOS-15
3590+
- macOS-15-intel
35913591
steps:
35923592
- name: Checkout
35933593
uses: actions/checkout@v4
@@ -4361,7 +4361,7 @@ jobs:
43614361
needs:
43624362
- bindist-x86_64-mac
43634363
runs-on:
4364-
- macOS-15
4364+
- macOS-15-intel
43654365
steps:
43664366
- name: Checkout
43674367
uses: actions/checkout@v4

0 commit comments

Comments
 (0)