Skip to content

Commit 9a47aa2

Browse files
authored
Swap to self hosted mac intel runners for installer build (#20009)
* Swap to self hosted mac intel runners for installer build * Change the test to also run self-hosted * Use self hosted mac intel runners, and limit some things to not always run on mac intel * Split the new mac intel rule to its own step
1 parent 29c25fb commit 9a47aa2

File tree

6 files changed

+31
-9
lines changed

6 files changed

+31
-9
lines changed

.github/workflows/build-macos-installers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
matrix:
5454
python-version: ["3.10"]
5555
os:
56-
- runs-on: macos-13
56+
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
5757
name: intel
5858
bladebit-suffix: macos-x86-64.tar.gz
5959
arch-artifact-name: intel
@@ -296,7 +296,7 @@ jobs:
296296
- name: 13
297297
matrix: 13
298298
runs-on:
299-
intel: macos-13
299+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
300300
- name: 14
301301
matrix: 14
302302
runs-on:

.github/workflows/check_wheel_availability.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: macOS
3333
matrix: macos
3434
runs-on:
35-
intel: macos-13
35+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
3636
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
3737
- name: Windows
3838
matrix: windows

.github/workflows/pre-commit.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: macOS
3030
matrix: macos
3131
runs-on:
32-
intel: macos-13
32+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
3333
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
3434
- name: Windows
3535
matrix: windows
@@ -50,6 +50,11 @@ jobs:
5050
matrix: windows
5151
arch:
5252
matrix: arm
53+
# Back to self hosted mac intel runners, which we have very few of
54+
- os:
55+
matrix: macos
56+
arch:
57+
matrix: intel
5358

5459
steps:
5560
- name: Clean workspace

.github/workflows/test-install-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
emoji: 🍎
4141
runs-on:
4242
arm: macos-15
43-
intel: macos-13
43+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
4444
matrix: macos
4545
- name: Windows
4646
emoji: 🪟

.github/workflows/test.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on:
4747
type: boolean
4848
run-macos-intel:
4949
description: "run macOS-intel tests"
50-
default: true
50+
default: false
5151
required: false
5252
type: boolean
5353
run-macos-arm:
@@ -104,12 +104,24 @@ jobs:
104104
|| 'main'
105105
}} >> "$GITHUB_OUTPUT"
106106
107+
- name: Generate mac intel configuration
108+
id: macintel
109+
run: |
110+
echo mac_intel=${{
111+
( github.event_name == 'schedule' || inputs.run-macos-intel )
112+
|| ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.ref, 'refs/heads/release/') )
113+
|| ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.base_ref, 'release/') )
114+
&& 'true'
115+
|| 'false'
116+
}} >> "$GITHUB_OUTPUT"
117+
107118
outputs:
108119
configuration: ${{ steps.configure.outputs.configuration }}
109120
matrix_mode: ${{ steps.configure.outputs.matrix_mode }}
121+
mac_intel: ${{ steps.macintel.outputs.mac_intel }}
110122

111123
macos-intel:
112-
if: github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
124+
if: needs.configure.outputs.mac_intel == 'true'
113125
uses: ./.github/workflows/test-single.yml
114126
needs: configure
115127
with:
@@ -120,7 +132,7 @@ jobs:
120132
concurrency-name: macos-intel
121133
configuration: ${{ needs.configure.outputs.configuration }}
122134
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
123-
runs-on: macos-13
135+
runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
124136
arch: intel
125137
arch-emoji: 🌀
126138
macos-arm:

.github/workflows/upload-pypi-source.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
matrix: macos
4545
emoji: 🍎
4646
runs-on:
47-
intel: macos-13
47+
intel: macos-13-intel
4848
arm: macos-13-arm64
4949
- name: Windows
5050
matrix: windows
@@ -74,6 +74,11 @@ jobs:
7474
matrix: windows
7575
arch:
7676
matrix: arm
77+
# Back to self hosted mac intel runners, which we have very few of
78+
- os:
79+
matrix: macos
80+
arch:
81+
matrix: intel
7782

7883
steps:
7984
- uses: chia-network/actions/clean-workspace@main

0 commit comments

Comments
 (0)