Skip to content

MacOS intel tests on macos-15-intel #20120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 1, 2025
Merged

MacOS intel tests on macos-15-intel #20120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
846308e
MacOS intel tests on macos-15-intel
cmmarslender Sep 29, 2025
1ae3769
Simplify allowed-skips condition in test.yml
altendky Sep 30, 2025
c49a529
Skip macOS intel timelord cases in workflow
altendky Sep 30, 2025
e42ef05
Fix comment syntax for macOS timelord cases
altendky Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/test-single.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 3 additions & 16 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading