Skip to content

Commit 846308e

Browse files
committed
MacOS intel tests on macos-15-intel
1 parent 2b6ff08 commit 846308e

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ on:
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:

0 commit comments

Comments
 (0)