From 816babdc2b6bbfac952686a18f45d319e22da673 Mon Sep 17 00:00:00 2001 From: Nye Liu Date: Wed, 7 May 2025 10:22:54 -0700 Subject: [PATCH 1/2] CI: remove ubuntu-20.04 --- .github/workflows/release.yml | 11 +---------- .github/workflows/test.yml | 7 ++----- README.md | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33387a5..e0da5eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,7 @@ env: jobs: release: - strategy: - matrix: - os: [ubuntu-20.04, ubuntu-22.04] - runs-on: ["${{ matrix.os }}"] + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -58,12 +55,6 @@ jobs: - name: Build release tarball run: ./ci/create-tarball.sh - - name: Rename binaries for ubuntu22 release - if: matrix.os == 'ubuntu-22.04' - run: | - mv solana-accountsdb-plugin-kafka-release-x86_64-unknown-linux-gnu.tar.bz2 solana-accountsdb-plugin-kafka-release22-x86_64-unknown-linux-gnu.tar.bz2 - mv solana-accountsdb-plugin-kafka-release-x86_64-unknown-linux-gnu.yml solana-accountsdb-plugin-kafka-release22-x86_64-unknown-linux-gnu.yml - - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73adc45..ba50dde 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,10 +10,7 @@ env: jobs: test: - strategy: - matrix: - os: [ubuntu-20.04, ubuntu-22.04] - runs-on: ["${{ matrix.os }}"] + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -50,7 +47,7 @@ jobs: path: | ~/.cargo/registry ~/.cargo/git - key: ${{ matrix.os }}-cargo-build-${{ hashFiles('**/Cargo.lock', 'rust-toolchain.toml') }}-${{ env.RUST_STABLE }} + key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock', 'rust-toolchain.toml') }}-${{ env.RUST_STABLE }} - name: cargo fmt uses: actions-rs/cargo@v1 diff --git a/README.md b/README.md index bbd73f9..c002733 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Find binary releases [here](https://github.com/Blockdaemon/solana-accountsdb-plu You will need version 3.15 or later of the protobuf compiler `protoc` installed, since it is required for the `--experimental_allow_proto3_optional` option. -Note that as of this writing, both ubuntu 20.04 and 22.04 have obsolete versions of `protoc`. +Note that as of this writing, ubuntu 22.04 still has an obsolete of `protoc`. For ubuntu, CI imports one from debian: From eab51687e7cdcef5c53f132ce8542df8601000c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 02:43:17 +0000 Subject: [PATCH 2/2] Bump tokio from 1.44.2 to 1.45.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.44.2 to 1.45.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.44.2...tokio-1.45.0) --- updated-dependencies: - dependency-name: tokio dependency-version: 1.45.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b4cdc3..9d42a24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4249,9 +4249,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.2" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" dependencies = [ "backtrace", "libc",