From e29a57fc580efeeccf95ebdb173b9e597a012b1c Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 26 Jul 2024 18:35:37 +0200 Subject: [PATCH 1/5] Test direct-minimal-versions --- .github/workflows/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a8e775..071390e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -158,6 +158,18 @@ jobs: RUST_BACKTRACE: "0" run: cargo -Z build-std test --features 'bundled-full session buildtime_bindgen preupdate_hook with-asan' --target x86_64-unknown-linux-gnu + direct-minimal-versions: + name: Test min versions + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - ueses: hecrj/setup-rust-action@v2 + with: + rust-version: nightly + - uses: Swatinem/rust-cache@v2 + - run: cargo update -Z direct-minimal-versions + - run: cargo test --workspace --all-targets --features bundled-full + # Ensure clippy doesn't complain. clippy: name: Clippy From 5438cd03c41d1026b04a7b95d0812aa2a46deb79 Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 26 Jul 2024 18:38:51 +0200 Subject: [PATCH 2/5] Oops --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 071390e..d4146a5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -163,7 +163,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - ueses: hecrj/setup-rust-action@v2 + - uses: hecrj/setup-rust-action@v2 with: rust-version: nightly - uses: Swatinem/rust-cache@v2 From 8bab6eb9a73bf4b9b1b5fabb98f3ee4660949148 Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 26 Jul 2024 18:41:31 +0200 Subject: [PATCH 3/5] Fix direct minimal versions Using the most recent versions currenlty available --- Cargo.toml | 6 +++--- libsqlite3-sys/Cargo.toml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0a20250..4808bd1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,10 +113,10 @@ modern-full = [ bundled-full = ["modern-full", "bundled"] [dependencies] -time = { version = "0.3.0", features = ["formatting", "macros", "parsing"], optional = true } -bitflags = "2.0" +time = { version = "0.3.36", features = ["formatting", "macros", "parsing"], optional = true } +bitflags = "2.6.0" hashlink = "0.9" -chrono = { version = "0.4", optional = true, default-features = false, features = ["clock"] } +chrono = { version = "0.4.38", optional = true, default-features = false, features = ["clock"] } serde_json = { version = "1.0", optional = true } csv = { version = "1.1", optional = true } url = { version = "2.1", optional = true } diff --git a/libsqlite3-sys/Cargo.toml b/libsqlite3-sys/Cargo.toml index f9c3704..0c435a4 100644 --- a/libsqlite3-sys/Cargo.toml +++ b/libsqlite3-sys/Cargo.toml @@ -35,16 +35,16 @@ with-asan = [] wasm32-wasi-vfs = [] [dependencies] -openssl-sys = { version = "0.9", optional = true } +openssl-sys = { version = "0.9.103", optional = true } [build-dependencies] bindgen = { version = "0.69", optional = true, default-features = false, features = ["runtime"] } pkg-config = { version = "0.3.19", optional = true } -cc = { version = "1.0", optional = true } -vcpkg = { version = "0.2", optional = true } +cc = { version = "1.1.6", optional = true } +vcpkg = { version = "0.2.15", optional = true } # for loadable_extension: -prettyplease = {version = "0.2", optional = true } +prettyplease = {version = "0.2.20", optional = true } # like bindgen -quote = { version = "1", optional = true, default-features = false } +quote = { version = "1.0.36", optional = true, default-features = false } # like bindgen -syn = { version = "2.0", optional = true, features = ["full", "extra-traits", "visit-mut"] } +syn = { version = "2.0.72", optional = true, features = ["full", "extra-traits", "visit-mut"] } From 79904517250f5b48cc19bf6c1db7a54d0f8d6703 Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 26 Jul 2024 18:48:05 +0200 Subject: [PATCH 4/5] Prepare patch release --- Cargo.toml | 4 ++-- libsqlite3-sys/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4808bd1..a8cb94a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rusqlite" # Note: Update version in README.md when you change this. -version = "0.32.0" +version = "0.32.1" authors = ["The rusqlite developers"] edition = "2021" description = "Ergonomic wrapper for SQLite" @@ -139,7 +139,7 @@ bencher = "0.1" [dependencies.libsqlite3-sys] path = "libsqlite3-sys" -version = "0.30.0" +version = "0.30.1" [[test]] name = "auto_ext" diff --git a/libsqlite3-sys/Cargo.toml b/libsqlite3-sys/Cargo.toml index 0c435a4..11fb6d8 100644 --- a/libsqlite3-sys/Cargo.toml +++ b/libsqlite3-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libsqlite3-sys" -version = "0.30.0" +version = "0.30.1" authors = ["The rusqlite developers"] edition = "2021" repository = "https://github.com/rusqlite/rusqlite" From c69f2f9a781b00824fa68925de4ee41cf26e2279 Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 26 Jul 2024 18:53:16 +0200 Subject: [PATCH 5/5] Cancel previous run --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4146a5..2001862 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,10 @@ env: permissions: contents: read +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + jobs: test: name: Test ${{ matrix.target }}