From 00755675a2eb584493d8b3ddc96633910b206123 Mon Sep 17 00:00:00 2001 From: Paul Horn Date: Fri, 29 Sep 2023 17:55:32 +0200 Subject: [PATCH 1/2] Use the MSRV lockfile for MSRV tests --- .github/workflows/checks.yml | 15 ++++++++++++--- ci/Cargo.lock.msrv | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 10ac6c43..862f88d0 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -38,8 +38,10 @@ jobs: toolchain: ${{ env.MSRV }} - name: Set up Rust cache uses: Swatinem/rust-cache@v2 + - name: Prepare MSRV lockfile + run: cp ci/Cargo.lock.msrv Cargo.lock - name: Run cargo check - run: cargo +$MSRV check --all-targets + run: cargo +$MSRV check --all-targets --locked fmt: name: Check formatting @@ -74,8 +76,10 @@ jobs: components: clippy - name: Set up Rust cache uses: Swatinem/rust-cache@v2 + - name: Prepare MSRV lockfile + run: cp ci/Cargo.lock.msrv Cargo.lock - name: Run clippy - run: cargo +$MSRV clippy --all-targets --all-features -- -D warnings + run: cargo +$MSRV clippy --all-targets --all-features --locked -- -D warnings unit-tests: name: Run unit tests @@ -98,6 +102,9 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Install cargo-nextest uses: taiki-e/install-action@nextest + - name: Prepare MSRV lockfile + run: cp ci/Cargo.lock.msrv Cargo.lock + if: matrix.rust == '1.60.0' - name: Run unit tests run: cargo +${{ matrix.rust }} nextest run --lib --all-features @@ -121,8 +128,10 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Install cargo-nextest uses: taiki-e/install-action@nextest + - name: Prepare MSRV lockfile + run: cp ci/Cargo.lock.msrv Cargo.lock - name: Run integration tests - run: env NEO4J_VERSION_TAG=${{ matrix.neo4j }} cargo +$MSRV nextest run --all-features + run: env NEO4J_VERSION_TAG=${{ matrix.neo4j }} cargo +$MSRV nextest run --all-features --locked msrv: name: Validate MSRV and minimal dependency versions diff --git a/ci/Cargo.lock.msrv b/ci/Cargo.lock.msrv index b7909fd2..17fabe63 100644 --- a/ci/Cargo.lock.msrv +++ b/ci/Cargo.lock.msrv @@ -629,7 +629,7 @@ dependencies = [ [[package]] name = "neo4rs" -version = "0.6.1" +version = "0.7.0-alpha.1" dependencies = [ "async-trait", "bytes", From ab8716cce4135d1bc3e85ce075914887f8717bce Mon Sep 17 00:00:00 2001 From: Paul Horn Date: Fri, 29 Sep 2023 17:58:38 +0200 Subject: [PATCH 2/2] Update and for use of min lockfile --- .github/workflows/checks.yml | 2 +- ci/Cargo.lock.min | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 862f88d0..3bc4588e 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -158,7 +158,7 @@ jobs: - name: Install cargo-nextest uses: taiki-e/install-action@nextest - name: Run ${{ matrix.name }} unit tests - run: cargo +$MSRV nextest run --lib --all-features + run: cargo +$MSRV nextest run --lib --all-features --locked release: name: Release diff --git a/ci/Cargo.lock.min b/ci/Cargo.lock.min index f5ad1428..8a458e93 100644 --- a/ci/Cargo.lock.min +++ b/ci/Cargo.lock.min @@ -546,7 +546,7 @@ dependencies = [ [[package]] name = "neo4rs" -version = "0.6.1" +version = "0.7.0-alpha.1" dependencies = [ "async-trait", "bytes",