From 302f1f772ddb24718f5b8462d292dc3a7d9ed4f8 Mon Sep 17 00:00:00 2001 From: battlmonstr <battlmonstr@users.noreply.github.com> Date: Tue, 9 Jan 2024 11:49:04 +0100 Subject: [PATCH] ci: run macOS jobs on macos-13 instead of macos-13-xlarge (#9177) macos-13-xlarge was needed to use M1 CPU, because previously silkworm-go didn't have macOS Intel support --- .github/workflows/ci.yml | 5 ++++- .github/workflows/qa-clean-exit.yml | 5 ----- .github/workflows/test-integration.yml | 5 ++++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82267c6fc..85bac6570 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,10 @@ jobs: if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} strategy: matrix: - os: [ ubuntu-22.04, macos-13-xlarge ] # list of os: https://github.com/actions/virtual-environments + # list of os: https://github.com/actions/virtual-environments + os: + - ubuntu-22.04 + - macos-13 runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/qa-clean-exit.yml b/.github/workflows/qa-clean-exit.yml index 51198fcc6..ace204be2 100644 --- a/.github/workflows/qa-clean-exit.yml +++ b/.github/workflows/qa-clean-exit.yml @@ -19,11 +19,6 @@ on: jobs: long-running-test: - #if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} - #strategy: - # matrix: - # os: [ ubuntu-22.04, macos-13-xlarge ] - #runs-on: ${{ matrix.os }} runs-on: self-hosted env: ERIGON_DATA_DIR: ${{ github.workspace }}/erigon_data diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 22e68e3fa..40564d2af 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -13,7 +13,10 @@ jobs: tests: strategy: matrix: - os: [ ubuntu-22.04, macos-13-xlarge ] # list of os: https://github.com/actions/virtual-environments + # list of os: https://github.com/actions/virtual-environments + os: + - ubuntu-22.04 + - macos-13 runs-on: ${{ matrix.os }} steps: