mirrors/syncstorage-rs
1
0
Fork 0
mirror of https://github.com/mozilla-services/syncstorage-rs.git synced 2026-05-05 20:26:26 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1518 from tarikeshaq/tarikeshaq/upgrade-rust

Browse Source 
Upgrades rustc in CI and Docker to 1.75
This commit is contained in:
Tarik Eshaq 2024-02-09 14:09:16 -05:00 committed by GitHub
commit d544a0e378
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml
View File

@ -18,7 +18,7 @@ commands:
name: Setup Rust checks
command: |
rustup component add rustfmt
cargo install cargo-audit
cargo install --locked cargo-audit
rustup component add clippy
setup-python:
steps:
@ -140,7 +140,7 @@ commands:
- run:
name: Install sccache
command: |
cargo install sccache
cargo install --locked sccache
# This configures Rust to use sccache.
echo 'export "RUSTC_WRAPPER"="sccache"' >> $BASH_ENV
# This is the maximum space sccache cache will use on disk.
@ -161,7 +161,7 @@ commands:
jobs:
checks:
docker:
- image: cimg/rust:1.72.0
- image: cimg/rust:1.75.0
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
@ -178,7 +178,7 @@ jobs:
build-and-test:
docker:
- image: cimg/rust:1.72.0
- image: cimg/rust:1.75.0
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
@ -214,7 +214,7 @@ jobs:
#- save-sccache-cache
build-mysql-image:
docker:
- image: cimg/rust:1.60.0
- image: cimg/rust:1.75.0
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
@ -245,7 +245,7 @@ jobs:
build-spanner-image:
docker:
- image: cimg/rust:1.60.0
- image: cimg/rust:1.75.0
auth:
username: $DOCKER_USER
password: $DOCKER_PASS

2
Dockerfile
View File

@ -1,5 +1,5 @@
# NOTE: Ensure builder's Rust version matches CI's in .circleci/config.yml
FROM docker.io/lukemathwalker/cargo-chef:0.1.62-rust-1.72-bullseye as chef
FROM docker.io/lukemathwalker/cargo-chef:0.1.62-rust-1.75-bullseye as chef
WORKDIR /app
FROM chef AS planner

2
syncserver/src/server/test.rs
View File

@ -145,7 +145,7 @@ fn create_request(
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:72.0) Gecko/20100101 Firefox/72.0",
));
if let Some(body) = payload {
req = req.set_json(&body);
req = req.set_json(body);
};
if let Some(h) = headers {
for (k, v) in h {

5
syncstorage-spanner/src/models.rs
View File

@ -1842,10 +1842,7 @@ impl SpannerDb {
sqlparam_types.insert("payload".to_owned(), payload.spanner_type());
sqlparams.insert("payload".to_string(), payload.into_spanner_value());
let now_millis = timestamp.as_i64();
let ttl = bso.ttl.map_or(i64::from(DEFAULT_BSO_TTL), |ttl| {
ttl.try_into()
.expect("Could not get ttl in put_bso_async_test")
}) * 1000;
let ttl = bso.ttl.map_or(i64::from(DEFAULT_BSO_TTL), |ttl| ttl.into()) * 1000;
let expirystring = to_rfc3339(now_millis + ttl)?;
debug!(
"!!!!! [test] INSERT expirystring:{:?}, timestamp:{:?}, ttl:{:?}",