Skip to content

Commit d7eb65e

Browse files
committed
Merge origin/main for current mobile validation
Signed-off-by: kenny lopez <[email protected]>
2 parents d002a86 + 22d96d9 commit d7eb65e

35 files changed

Lines changed: 1590 additions & 80 deletions

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ jobs:
144144
run: |
145145
scripts/test-rust-cache-contract.sh
146146
scripts/test-rust-cache-contract-regressions.sh
147+
- name: SQLx dependency pin
148+
run: |
149+
python3 scripts/check-sqlx-pin.py
150+
python3 scripts/test-sqlx-pin.py
147151
- name: CI required-context isolation contract
148152
run: scripts/test-ci-required-context-isolation.sh
149153
- name: CI path selection regression tests

‎Cargo.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ tower = { version = "0.5", features = ["timeout", "util", "limit"] }
5757
tower-http = { version = "0.6", features = ["trace", "cors", "compression-gzip", "limit", "timeout", "fs"] }
5858

5959
# Database
60-
sqlx = { version = "0.9", features = [
60+
sqlx = { version = "=0.9.0", features = [
6161
"runtime-tokio", "tls-rustls", "postgres", "uuid", "chrono", "json"
6262
] }
6363

@@ -193,8 +193,13 @@ strip = true
193193
# allowlist for the auth token). Revert to crates.io once #449 lands upstream.
194194
[patch.crates-io]
195195
aws-creds = { git = "https://github.com/tlongwell-block/rust-s3", rev = "c9fce3620dd434c1f810101d672cf384268dbb0f" }
196-
# SQLx: pin every crate to one unreleased upstream commit until 0.9.1 ships.
197-
# The crates share types, so they must move together. It carries two fixes:
196+
# SQLx: pin every crate together; these crates share types. This unreleased
197+
# revision includes the whole-return deadline from the open upstream PR #4407
198+
# and retains the fixes below. Return to a released version once it includes
199+
# all three fixes:
200+
# - https://github.com/transact-rs/sqlx/pull/4407: bound the entire return to
201+
# the pool, including the release hook and SQLx ping, to five seconds. Silent
202+
# sockets must release their pool permits so new connections can replace them.
198203
# - https://github.com/transact-rs/sqlx/pull/4394: a `BEGIN` whose future is
199204
# dropped before Postgres answers no longer returns its pooled connection
200205
# still inside the transaction. 0.9.0 queues no `ROLLBACK` for it, so the
@@ -203,10 +208,14 @@ aws-creds = { git = "https://github.com/tlongwell-block/rust-s3", rev = "c9fce36
203208
# - https://github.com/transact-rs/sqlx/pull/4402: MeshLLM 0.76 uses
204209
# libsqlite3-sys 0.38, which 0.9.0's optional SQLite driver rejects; Cargo
205210
# resolves it even though Buzz only enables PostgreSQL.
206-
sqlx = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
207-
sqlx-core = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
208-
sqlx-macros = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
209-
sqlx-macros-core = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
210-
sqlx-mysql = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
211-
sqlx-postgres = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
212-
sqlx-sqlite = { git = "https://github.com/launchbadge/sqlx", rev = "f1e94ec34dd5f11ad6488a3a8ac7988439a3f757" }
211+
# The exact version prevents lockfile updates from selecting a newer unpatched
212+
# release. Renovate updates are disabled for these crates; CI checks this pin
213+
# with scripts/check-sqlx-pin.py. Update that policy only after verifying all
214+
# three fixes in the replacement release.
215+
sqlx = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }
216+
sqlx-core = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }
217+
sqlx-macros = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }
218+
sqlx-macros-core = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }
219+
sqlx-mysql = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }
220+
sqlx-postgres = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }
221+
sqlx-sqlite = { git = "https://github.com/launchbadge/sqlx", rev = "c3735abf034689bb1fab9d7bf9f040e492de28cf" }

0 commit comments

Comments
 (0)