5252 type : boolean
5353 run-macos-intel :
5454 description : " run macOS-intel tests"
55- default : false
55+ default : true
5656 required : false
5757 type : boolean
5858 run-macos-arm :
@@ -109,24 +109,12 @@ jobs:
109109 || 'main'
110110 }} >> "$GITHUB_OUTPUT"
111111
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-
123112 outputs :
124113 configuration : ${{ steps.configure.outputs.configuration }}
125114 matrix_mode : ${{ steps.configure.outputs.matrix_mode }}
126- mac_intel : ${{ steps.macintel.outputs.mac_intel }}
127115
128116 macos-intel :
129- if : needs.configure.outputs.mac_intel == 'true'
117+ if : github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
130118 uses : ./.github/workflows/test-single.yml
131119 needs : configure
132120 with :
@@ -137,7 +125,7 @@ jobs:
137125 concurrency-name : macos-intel
138126 configuration : ${{ needs.configure.outputs.configuration }}
139127 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
141129 arch : intel
142130 arch-emoji : 🌀
143131 macos-arm :
@@ -235,7 +223,6 @@ jobs:
235223 - uses : re-actors/alls-green@release/v1.2
236224 id : alls-green
237225 with :
238- allowed-skips : ${{ needs.configure.outputs.mac_intel != 'true' && 'macos-intel' || '' }}
239226 jobs : ${{ toJSON(needs) }}
240227
241228 - uses : actions/checkout@v5
@@ -249,7 +236,7 @@ jobs:
249236
250237 - name : Download Results
251238 if : false
252- uses : actions/download-artifact@v4
239+ uses : actions/download-artifact@v5
253240 with :
254241 merge-multiple : true
255242 pattern : junit-data-*
@@ -275,7 +262,7 @@ jobs:
275262 if-no-files-found : error
276263
277264 - name : Download Coverage
278- uses : actions/download-artifact@v4
265+ uses : actions/download-artifact@v5
279266 with :
280267 merge-multiple : true
281268 pattern : coverage-data-*
0 commit comments