File tree Expand file tree Collapse file tree 6 files changed +31
-9
lines changed Expand file tree Collapse file tree 6 files changed +31
-9
lines changed Original file line number Diff line number Diff line change 53
53
matrix :
54
54
python-version : ["3.10"]
55
55
os :
56
- - runs-on : macos-13
56
+ - runs-on : ${{ github.repository_owner == 'Chia-Network' && ' macos-13-intel' || 'macos-13' }}
57
57
name : intel
58
58
bladebit-suffix : macos-x86-64.tar.gz
59
59
arch-artifact-name : intel
@@ -296,7 +296,7 @@ jobs:
296
296
- name : 13
297
297
matrix : 13
298
298
runs-on :
299
- intel : macos-13
299
+ intel : ${{ github.repository_owner == 'Chia-Network' && ' macos-13-intel' || 'macos-13' }}
300
300
- name : 14
301
301
matrix : 14
302
302
runs-on :
Original file line number Diff line number Diff line change 32
32
- name : macOS
33
33
matrix : macos
34
34
runs-on :
35
- intel : macos-13
35
+ intel : ${{ github.repository_owner == 'Chia-Network' && ' macos-13-intel' || 'macos-13' }}
36
36
arm : ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
37
37
- name : Windows
38
38
matrix : windows
Original file line number Diff line number Diff line change 29
29
- name : macOS
30
30
matrix : macos
31
31
runs-on :
32
- intel : macos-13
32
+ intel : ${{ github.repository_owner == 'Chia-Network' && ' macos-13-intel' || 'macos-13' }}
33
33
arm : ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
34
34
- name : Windows
35
35
matrix : windows
50
50
matrix : windows
51
51
arch :
52
52
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
53
58
54
59
steps :
55
60
- name : Clean workspace
Original file line number Diff line number Diff line change 40
40
emoji : 🍎
41
41
runs-on :
42
42
arm : macos-15
43
- intel : macos-13
43
+ intel : ${{ github.repository_owner == 'Chia-Network' && ' macos-13-intel' || 'macos-13' }}
44
44
matrix : macos
45
45
- name : Windows
46
46
emoji : 🪟
Original file line number Diff line number Diff line change 47
47
type : boolean
48
48
run-macos-intel :
49
49
description : " run macOS-intel tests"
50
- default : true
50
+ default : false
51
51
required : false
52
52
type : boolean
53
53
run-macos-arm :
@@ -104,12 +104,24 @@ jobs:
104
104
|| 'main'
105
105
}} >> "$GITHUB_OUTPUT"
106
106
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
+
107
118
outputs :
108
119
configuration : ${{ steps.configure.outputs.configuration }}
109
120
matrix_mode : ${{ steps.configure.outputs.matrix_mode }}
121
+ mac_intel : ${{ steps.macintel.outputs.mac_intel }}
110
122
111
123
macos-intel :
112
- if : github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
124
+ if : needs.configure.outputs.mac_intel == 'true'
113
125
uses : ./.github/workflows/test-single.yml
114
126
needs : configure
115
127
with :
@@ -120,7 +132,7 @@ jobs:
120
132
concurrency-name : macos-intel
121
133
configuration : ${{ needs.configure.outputs.configuration }}
122
134
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' }}
124
136
arch : intel
125
137
arch-emoji : 🌀
126
138
macos-arm :
Original file line number Diff line number Diff line change 44
44
matrix : macos
45
45
emoji : 🍎
46
46
runs-on :
47
- intel : macos-13
47
+ intel : macos-13-intel
48
48
arm : macos-13-arm64
49
49
- name : Windows
50
50
matrix : windows
74
74
matrix : windows
75
75
arch :
76
76
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
77
82
78
83
steps :
79
84
- uses : chia-network/actions/clean-workspace@main
You can’t perform that action at this time.
0 commit comments