Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build-macos-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
matrix:
python-version: ["3.10"]
os:
- runs-on: macos-13
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
name: intel
bladebit-suffix: macos-x86-64.tar.gz
arch-artifact-name: intel
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
- name: 13
matrix: 13
runs-on:
intel: macos-13
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
- name: 14
matrix: 14
runs-on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_wheel_availability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: macOS
matrix: macos
runs-on:
intel: macos-13
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
- name: Windows
matrix: windows
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: macOS
matrix: macos
runs-on:
intel: macos-13
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
- name: Windows
matrix: windows
Expand All @@ -50,6 +50,11 @@ jobs:
matrix: windows
arch:
matrix: arm
# Back to self hosted mac intel runners, which we have very few of
- os:
matrix: macos
arch:
matrix: intel

steps:
- name: Clean workspace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
emoji: 🍎
runs-on:
arm: macos-15
intel: macos-13
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
matrix: macos
- name: Windows
emoji: 🪟
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ on:
type: boolean
run-macos-intel:
description: "run macOS-intel tests"
default: true
default: false
required: false
type: boolean
run-macos-arm:
Expand Down Expand Up @@ -104,12 +104,24 @@ 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: github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
if: needs.configure.outputs.mac_intel == 'true'
uses: ./.github/workflows/test-single.yml
needs: configure
with:
Expand All @@ -120,7 +132,7 @@ jobs:
concurrency-name: macos-intel
configuration: ${{ needs.configure.outputs.configuration }}
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
runs-on: macos-13
runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
arch: intel
arch-emoji: 🌀
macos-arm:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/upload-pypi-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
matrix: macos
emoji: 🍎
runs-on:
intel: macos-13
intel: macos-13-intel
arm: macos-13-arm64
- name: Windows
matrix: windows
Expand Down Expand Up @@ -74,6 +74,11 @@ jobs:
matrix: windows
arch:
matrix: arm
# Back to self hosted mac intel runners, which we have very few of
- os:
matrix: macos
arch:
matrix: intel

steps:
- uses: chia-network/actions/clean-workspace@main
Expand Down
Loading