Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades rustc in CI and Docker to 1.75 #1518

Merged
merged 2 commits into from
Feb 9, 2024
Merged

Upgrades rustc in CI and Docker to 1.75 #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f87293c
Upgrades rustc in CI and Docker to 1.75
Feb 8, 2024
59af44c
Adds --locked to cargo install in CI
Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion syncserver/src/server/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions syncstorage-spanner/src/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
tarikeshaq marked this conversation as resolved.
Show resolved Hide resolved
let expirystring = to_rfc3339(now_millis + ttl)?;
debug!(
"!!!!! [test] INSERT expirystring:{:?}, timestamp:{:?}, ttl:{:?}",
Expand Down