diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8f170856..5c977d3b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - v4.x push: branches: - master @@ -63,6 +64,15 @@ jobs: run: cargo doc --no-deps -p boring -p boring-sys --features rpk,pq-experimental,underscore-wildcards env: DOCS_RS: 1 + - name: Cargo.toml boring versions consistency + shell: bash + run: | + WORKSPACE_VERSION=$(grep -F '[workspace.package]' -A1 Cargo.toml | grep -F version | grep -Eo '".*"') + if [[ -z "$WORKSPACE_VERSION" ]]; then echo 2>&1 "error: can't find boring version"; exit 1; fi + if grep -E 'boring.* =' Cargo.toml | grep -vF "$WORKSPACE_VERSION"; then + echo 2>&1 "error: boring dependencies must match workspace version $WORKSPACE_VERSION" + exit 1 + fi test: name: Test runs-on: ${{ matrix.os }} diff --git a/Cargo.toml b/Cargo.toml index eb99271d6..91b6b54b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,9 +19,9 @@ tag-prefix = "" publish = false [workspace.dependencies] -boring-sys = { version = "4.19.0", path = "./boring-sys" } -boring = { version = "4.19.0", path = "./boring" } -tokio-boring = { version = "4.19.0", path = "./tokio-boring" } +boring-sys = { version = "4.20.0", path = "./boring-sys" } +boring = { version = "4.20.0", path = "./boring" } +tokio-boring = { version = "4.20.0", path = "./tokio-boring" } bindgen = { version = "0.72.0", default-features = false, features = ["runtime"] } bitflags = "2.9"