From 85a0338ccd775a36e9b1577da04cdf224de592db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:31:55 +0000 Subject: [PATCH 1/4] chore(deps): Bump tokio from 1.41.1 to 1.42.0 (#1604) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.41.1 to 1.42.0.
Release notes

Sourced from tokio's releases.

Tokio v1.42.0

1.42.0 (Dec 3rd, 2024)

Added

Fixed

Changes

Documented

#6791: tokio-rs/tokio#6791 #6929: tokio-rs/tokio#6929 #6966: tokio-rs/tokio#6966 #6967: tokio-rs/tokio#6967 #6982: tokio-rs/tokio#6982 #6999: tokio-rs/tokio#6999

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.41.1&new-version=1.42.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f38839a8..36d408f67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2562,7 +2562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -5095,9 +5095,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", From 4678a69a9c1cd6d06923fa9ec06987bd5b5db1d5 Mon Sep 17 00:00:00 2001 From: verma nakul Date: Mon, 16 Dec 2024 15:07:32 +0530 Subject: [PATCH 2/4] feat: Updating Group dependency for GitHub Actions and Cargo (#1623) ### What does this PR do? Updating the `.github/dependabot.yml` file to group dependency updates for: - GitHub Actions: All updates will now be grouped under a single PR using the `all-actions` group. - Cargo: Updates will be batched into a single PR using the `all-cargo` group. ### Which issue does this PR Fixes? - Fixes #1622 --------- Co-authored-by: Lucas Co-authored-by: Frank Elsinga --- .github/dependabot.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce9e973a2..8212356a9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,9 +5,27 @@ updates: directory: "/" schedule: interval: "daily" + groups: + all-actions-version-updates: + applies-to: version-updates + patterns: + - "*" + all-actions-security-updates: + applies-to: security-updates + patterns: + - "*" - package-ecosystem: cargo directory: "/" schedule: interval: daily time: "02:00" open-pull-requests-limit: 10 + groups: + all-cargo-version-updates: + applies-to: version-updates + patterns: + - "*" + all-cargo-security-updates: + applies-to: security-updates + patterns: + - "*" From 099a6c862f6ff8a0b61b8fa9a931d29a33018be5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 02:48:43 +0000 Subject: [PATCH 3/4] chore(deps): Bump the all-cargo-version-updates group with 2 updates (#1624) Bumps the all-cargo-version-updates group with 2 updates: [deadpool-postgres](https://github.com/bikeshedder/deadpool) and [thiserror](https://github.com/dtolnay/thiserror). Updates `deadpool-postgres` from 0.14.0 to 0.14.1
Commits
  • b438af3 Release deadpool-postgres 0.14.1
  • 2aed3a4 Add missing re-export of LoadBalanceHosts
  • ac5d03d Allow configuring Redis connections via AsyncConnectionConfig
  • eadd120 replaced private sentinel_connection_info field with public node_connection_i...
  • 9862d3f Update Cargo.toml
  • ecdaea2 Fix links in CHANGELOG
  • 3881487 Release deadpool-sqlite 0.9.0
  • ed5b13b Release deadpool-redis 0.18.0
  • 3f7dcbe Update itertools to version 0.13.0
  • 8556502 Update Redis to 0.27.
  • Additional commits viewable in compare view

Updates `thiserror` from 2.0.7 to 2.0.8
Release notes

Sourced from thiserror's releases.

2.0.8

  • Improve support for macro-generated derive(Error) call sites (#399)
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36d408f67..a95fb2e18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1185,9 +1185,9 @@ dependencies = [ [[package]] name = "deadpool-postgres" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab8a4ea925ce79678034870834602a2980f4b88c09e97feb266496dbb4493d2" +checksum = "3d697d376cbfa018c23eb4caab1fd1883dd9c906a8c034e8d9a3cb06a7e0bef9" dependencies = [ "async-trait", "deadpool", @@ -2701,7 +2701,7 @@ dependencies = [ "static-files", "subst", "testcontainers-modules", - "thiserror 2.0.7", + "thiserror 2.0.8", "tilejson", "tokio", "tokio-postgres-rustls", @@ -2746,7 +2746,7 @@ dependencies = [ "sqlite-compressions", "sqlite-hashes", "sqlx", - "thiserror 2.0.7", + "thiserror 2.0.8", "tilejson", "tokio", "xxhash-rust", @@ -3617,7 +3617,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2", - "thiserror 2.0.7", + "thiserror 2.0.8", "tokio", "tracing", ] @@ -3636,7 +3636,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.7", + "thiserror 2.0.8", "tinyvec", "tracing", "web-time", @@ -4939,11 +4939,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.7" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" dependencies = [ - "thiserror-impl 2.0.7", + "thiserror-impl 2.0.8", ] [[package]] @@ -4959,9 +4959,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.7" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" dependencies = [ "proc-macro2", "quote", From 321b7f06bcf9eac6c7ea74c5a1e24343443aeed6 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Fri, 20 Dec 2024 00:36:21 +0100 Subject: [PATCH 4/4] temporary disable macos-13 testcase (#1626) --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38c8147b7..1f0926877 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -318,8 +318,9 @@ jobs: fail-fast: true matrix: include: - - target: x86_64-apple-darwin - os: macos-13 + # temporary disabled due to an issue with homebrew which is difficult to debug + # - target: x86_64-apple-darwin + # os: macos-13 - target: x86_64-pc-windows-msvc os: windows-latest ext: '.exe'