From 615d568557c3b3aa2d9fcc850d8df2614d5b3409 Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Mon, 20 Jan 2025 11:57:00 +0100 Subject: [PATCH] fix and update CI jobs --- .github/workflows/build_electrs.yml | 2 +- .github/workflows/cont_integration.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_electrs.yml b/.github/workflows/build_electrs.yml index eb26d45..0a9a883 100644 --- a/.github/workflows/build_electrs.yml +++ b/.github/workflows/build_electrs.yml @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, macos-11] + os: [ubuntu-24.04, macos-15] env: ELECTRS_COMMIT: "a33e97e1a1fc63fa9c20a116bb92579bbf43b254" diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 0f595a7..dfbebe2 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -11,7 +11,7 @@ jobs: build: strategy: matrix: - os: ["macos-12", "ubuntu-22.04", "windows-2022"] + os: ["macos-14", "ubuntu-24.04", "windows-2022"] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -44,7 +44,7 @@ jobs: test-electrs-esplora: name: Test Electrs Esplora - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: CARGO_TERM_COLOR: always strategy: @@ -59,7 +59,7 @@ jobs: test-electrs-no-download: name: Test Electrs no auto-download features - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: CARGO_TERM_COLOR: always ELECTRS_EXEC: "/home/runner/.cargo-install/electrs/bin/electrs" @@ -74,10 +74,10 @@ jobs: - name: Checkout Crate uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 - - run: cargo test --features 'bitcoind/25_0' + - run: cargo test --features 'corepc-node/25_0' cosmetics: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2