diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml index f60e2990e680..8b28b63c3a55 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 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