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 <sda@fstab.net>
This commit is contained in:
Chris Marslender
2025-10-01 12:53:48 -05:00
committed by GitHub
co-authored by Kyle Altendorf
parent a2940d0a0d
commit 80ea5fe932
2 changed files with 9 additions and 16 deletions
+6
View File
@@ -118,6 +118,12 @@ jobs:
matrix: windows
configuration:
name: core.full_node
# TODO: skipping macos-15-intel timelord cases until fixed
# https://github.com/Chia-Network/chiavdf/pull/268
- os:
matrix: macos-intel
configuration:
install_timelord: true
- python:
exclude_from:
${{ inputs.matrix_mode }}: True
+3 -16
View File
@@ -52,7 +52,7 @@ on:
type: boolean
run-macos-intel:
description: "run macOS-intel tests"
default: false
default: true
required: false
type: boolean
run-macos-arm:
@@ -109,24 +109,12 @@ jobs:
|| 'main'
}} >> "$GITHUB_OUTPUT"
- name: Generate mac intel configuration
id: macintel
run: |
echo mac_intel=${{
( github.event_name == 'schedule' || inputs.run-macos-intel )
|| ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.ref, 'refs/heads/release/') )
|| ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.base_ref, 'release/') )
&& 'true'
|| 'false'
}} >> "$GITHUB_OUTPUT"
outputs:
configuration: ${{ steps.configure.outputs.configuration }}
matrix_mode: ${{ steps.configure.outputs.matrix_mode }}
mac_intel: ${{ steps.macintel.outputs.mac_intel }}
macos-intel:
if: needs.configure.outputs.mac_intel == 'true'
if: github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
uses: ./.github/workflows/test-single.yml
needs: configure
with:
@@ -137,7 +125,7 @@ jobs:
concurrency-name: macos-intel
configuration: ${{ needs.configure.outputs.configuration }}
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
runs-on: macos-15-intel
arch: intel
arch-emoji: 🌀
macos-arm:
@@ -235,7 +223,6 @@ jobs:
- uses: re-actors/alls-green@release/v1.2
id: alls-green
with:
allowed-skips: ${{ needs.configure.outputs.mac_intel != 'true' && 'macos-intel' || '' }}
jobs: ${{ toJSON(needs) }}
- uses: actions/checkout@v5