From 3716923393220d7f4870e09513b7f70b11d86e06 Mon Sep 17 00:00:00 2001 From: battlmonstr Date: Mon, 27 Nov 2023 14:54:42 +0100 Subject: [PATCH] ci: update OS to ubuntu-22.04 and macOS 13 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/test-integration-caplin.yml | 3 +-- .github/workflows/test-integration.yml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aea733b4e19..cc9b9045b82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} strategy: matrix: - os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments + os: [ ubuntu-22.04, macos-13 ] # list of os: https://github.com/actions/virtual-environments runs-on: ${{ matrix.os }} steps: @@ -109,7 +109,7 @@ jobs: docker-build-check: # don't run this on devel - the PR must have run it to be merged and it misleads that this pushes the docker image if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/devel' }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: AutoModality/action-clean@v1 - uses: actions/checkout@v3 @@ -125,7 +125,7 @@ jobs: # automated-tests: # runs-on: -# ubuntu-20.04 +# ubuntu-22.04 # if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} # steps: # - uses: actions/checkout@v3 diff --git a/.github/workflows/test-integration-caplin.yml b/.github/workflows/test-integration-caplin.yml index 84a7c25f803..a93f23bcbe9 100644 --- a/.github/workflows/test-integration-caplin.yml +++ b/.github/workflows/test-integration-caplin.yml @@ -21,8 +21,7 @@ jobs: strategy: matrix: # disable macos-11 until https://github.com/ledgerwatch/erigon/issues/8789 -# os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments - os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments + os: [ ubuntu-22.04 ] # list of os: https://github.com/actions/virtual-environments runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index dd90ea72721..72a77df04a6 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -13,7 +13,7 @@ jobs: tests: strategy: matrix: - os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments + os: [ ubuntu-22.04, macos-13 ] # list of os: https://github.com/actions/virtual-environments runs-on: ${{ matrix.os }} steps: