Skip to content

Commit 80ea5fe

Browse files
MacOS intel tests on macos-15-intel (#20120)
* MacOS intel tests on macos-15-intel * Simplify allowed-skips condition in test.yml https://github.com/Chia-Network/chia-blockchain/actions/runs/18106707994/job/51522945611?pr=20120#step:8:51 * Skip macOS intel timelord cases in workflow Commented out macOS timelord cases due to issues. * Fix comment syntax for macOS timelord cases Updated comments to use hash symbol for skipping macOS cases. --------- Co-authored-by: Kyle Altendorf <[email protected]>
1 parent a2940d0 commit 80ea5fe

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

.github/workflows/test-single.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ jobs:
118118
matrix: windows
119119
configuration:
120120
name: core.full_node
121+
# TODO: skipping macos-15-intel timelord cases until fixed
122+
# https://github.com/Chia-Network/chiavdf/pull/268
123+
- os:
124+
matrix: macos-intel
125+
configuration:
126+
install_timelord: true
121127
- python:
122128
exclude_from:
123129
${{ inputs.matrix_mode }}: True

.github/workflows/test.yml

Lines changed: 3 additions & 16 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:
@@ -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

0 commit comments

Comments
 (0)