From 846308e9d9cc66b227da8e85c60a8c1db6bf6dd9 Mon Sep 17 00:00:00 2001 From: Chris Marslender Date: Mon, 29 Sep 2025 13:22:21 -0500 Subject: [PATCH 1/8] MacOS intel tests on macos-15-intel --- .github/workflows/test.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 829eac8879f7..c99854b28ee9 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: From 1ae3769844aa86f6415e9175f23bf0f95e67fd35 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 30 Sep 2025 08:49:56 -0400 Subject: [PATCH 2/8] Simplify allowed-skips condition in test.yml https://github.com/Chia-Network/chia-blockchain/actions/runs/18106707994/job/51522945611?pr=20120#step:8:51 --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c99854b28ee9..5a3f41dd7931 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -223,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 From c49a5299b0eee8a3749e2d4c92f4385c73beebfa Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 30 Sep 2025 12:40:10 -0400 Subject: [PATCH 3/8] Skip macOS intel timelord cases in workflow Commented out macOS timelord cases due to issues. --- .github/workflows/test-single.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml index f60e2990e680..6e96b4fa83df 100644 --- a/.github/workflows/test-single.yml +++ b/.github/workflows/test-single.yml @@ -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 From e42ef05fdd37d249b4b6f78d4a062eea07a54587 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 30 Sep 2025 12:43:20 -0400 Subject: [PATCH 4/8] Fix comment syntax for macOS timelord cases Updated comments to use hash symbol for skipping macOS cases. --- .github/workflows/test-single.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml index 6e96b4fa83df..8b28b63c3a55 100644 --- a/.github/workflows/test-single.yml +++ b/.github/workflows/test-single.yml @@ -118,8 +118,8 @@ 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 + # TODO: skipping macos-15-intel timelord cases until fixed + # https://github.com/Chia-Network/chiavdf/pull/268 - os: matrix: macos-intel configuration: From 97407e3a0a50ed55ca8c322dd3a15d2f47cfaf0c Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 1 Oct 2025 13:14:51 -0400 Subject: [PATCH 5/8] try fix --- .github/workflows/test-single.yml | 6 ------ install-timelord.sh | 16 ++++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml index 8b28b63c3a55..f60e2990e680 100644 --- a/.github/workflows/test-single.yml +++ b/.github/workflows/test-single.yml @@ -118,12 +118,6 @@ 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 diff --git a/install-timelord.sh b/install-timelord.sh index 35583f06c447..b45200ac62f1 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 --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" 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 --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" 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 --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" 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 --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" symlink_vdf_bench "$PYTHON_VERSION" else echo "No venv created yet, please run install.sh." From 3aab7a2f0a13b89f24eafae58e103d0fa05962d3 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 1 Oct 2025 13:16:36 -0400 Subject: [PATCH 6/8] more hack --- install-timelord.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install-timelord.sh b/install-timelord.sh index b45200ac62f1..16d68015e5d2 100755 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -89,6 +89,8 @@ elif [ "$(uname)" = "Darwin" ]; then echo "Found MacOS." fi +CHIAVDF_VERSION= + if [ -e "$THE_PATH" ]; then echo "$THE_PATH" echo "vdf_client already exists, no action taken" From e045f89489e40c203cd35235da2ec575e0112726 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 1 Oct 2025 13:20:54 -0400 Subject: [PATCH 7/8] or this --- install-timelord.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/install-timelord.sh b/install-timelord.sh index 16d68015e5d2..19464f56fe8f 100755 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -89,8 +89,6 @@ elif [ "$(uname)" = "Darwin" ]; then echo "Found MacOS." fi -CHIAVDF_VERSION= - if [ -e "$THE_PATH" ]; then echo "$THE_PATH" echo "vdf_client already exists, no action taken" @@ -101,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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + echo venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + venv/bin/python -m pip install --force --no-binary '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" @@ -110,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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + echo venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + venv/bin/python -m pip install --force --no-binary '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." @@ -126,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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + echo venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + venv/bin/python -m pip install --force --no-binary '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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' "$CHIAVDF_VERSION" + echo venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + venv/bin/python -m pip install --force --no-binary '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." From 926f96a822f995da019e34ffca8b2796e44ccaf7 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 1 Oct 2025 13:26:24 -0400 Subject: [PATCH 8/8] also --- install-timelord.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install-timelord.sh b/install-timelord.sh index 19464f56fe8f..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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + 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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + 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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + 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 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' - venv/bin/python -m pip install --force --no-binary 'git+https://github.com/chia-network/chiavdf@update_macos_runner_selections' + 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."