Skip to content

macos intel 15 try fix #20131

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

Closed
wants to merge 8 commits into from
+11 −24
Closed

macos intel 15 try fix #20131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 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
97407e3
try fix
altendky Oct 1, 2025
3aab7a2
more hack
altendky Oct 1, 2025
e045f89
or this
altendky Oct 1, 2025
926f96a
also
altendky Oct 1, 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
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
16 changes: 8 additions & 8 deletions install-timelord.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,17 @@ else
echo "apt-get install libgmp-dev libboost-python-dev $PYTHON_DEV_DEPENDENCY libboost-system-dev build-essential -y"
sudo apt-get install libgmp-dev libboost-python-dev "$PYTHON_DEV_DEPENDENCY" libboost-system-dev build-essential -y
echo "Installing chiavdf from source on Ubuntu/Debian"
echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
echo venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
symlink_vdf_bench "$PYTHON_VERSION"
elif [ -e venv/bin/python ] && test "$RHEL_BASED"; then
echo "Installing chiavdf dependencies on RedHat/CentOS/Fedora"
# Install remaining needed development tools - assumes venv and prior run of install.sh
echo "$yumcmd"
${yumcmd}
echo "Installing chiavdf from source on RedHat/CentOS/Fedora"
echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
echo venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
symlink_vdf_bench "$PYTHON_VERSION"
elif [ -e venv/bin/python ] && test "$MACOS"; then
echo "Installing chiavdf dependencies for MacOS."
Expand All @@ -124,14 +124,14 @@ else
export CPPFLAGS="-I/usr/local/opt/[email protected]/include"
echo "Installing chiavdf from source."
# User needs to provide required packages
echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
echo venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
symlink_vdf_bench "$PYTHON_VERSION"
elif [ -e venv/bin/python ]; then
echo "Installing chiavdf from source."
# User needs to provide required packages
echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
echo venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
venv/bin/python -m pip install --force 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections'
symlink_vdf_bench "$PYTHON_VERSION"
else
echo "No venv created yet, please run install.sh."
Expand Down
Loading