diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 829eac8879f7..5a3f41dd7931 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/install-timelord.sh b/install-timelord.sh index 35583f06c447..e185558a65ee 100755 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -99,8 +99,8 @@ 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" @@ -108,8 +108,8 @@ else 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." @@ -124,14 +124,14 @@ else export CPPFLAGS="-I/usr/local/opt/boost@1.85/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."