52
52
type : boolean
53
53
run-macos-intel :
54
54
description : " run macOS-intel tests"
55
- default : false
55
+ default : true
56
56
required : false
57
57
type : boolean
58
58
run-macos-arm :
@@ -109,24 +109,12 @@ jobs:
109
109
|| 'main'
110
110
}} >> "$GITHUB_OUTPUT"
111
111
112
- - name : Generate mac intel configuration
113
- id : macintel
114
- run : |
115
- echo mac_intel=${{
116
- ( github.event_name == 'schedule' || inputs.run-macos-intel )
117
- || ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.ref, 'refs/heads/release/') )
118
- || ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.base_ref, 'release/') )
119
- && 'true'
120
- || 'false'
121
- }} >> "$GITHUB_OUTPUT"
122
-
123
112
outputs :
124
113
configuration : ${{ steps.configure.outputs.configuration }}
125
114
matrix_mode : ${{ steps.configure.outputs.matrix_mode }}
126
- mac_intel : ${{ steps.macintel.outputs.mac_intel }}
127
115
128
116
macos-intel :
129
- if : needs.configure.outputs.mac_intel == 'true'
117
+ if : github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
130
118
uses : ./.github/workflows/test-single.yml
131
119
needs : configure
132
120
with :
@@ -137,7 +125,7 @@ jobs:
137
125
concurrency-name : macos-intel
138
126
configuration : ${{ needs.configure.outputs.configuration }}
139
127
matrix_mode : ${{ needs.configure.outputs.matrix_mode }}
140
- runs-on : ${{ github.repository_owner == 'Chia-Network' && ' macos-13 -intel' || 'macos-13' }}
128
+ runs-on : macos-15 -intel
141
129
arch : intel
142
130
arch-emoji : 🌀
143
131
macos-arm :
@@ -235,7 +223,6 @@ jobs:
235
223
- uses : re-actors/alls-green@release/v1.2
236
224
id : alls-green
237
225
with :
238
- allowed-skips : ${{ needs.configure.outputs.mac_intel != 'true' && 'macos-intel' || '' }}
239
226
jobs : ${{ toJSON(needs) }}
240
227
241
228
- uses : actions/checkout@v5
0 commit comments