Skip to content
This repository has been archived by the owner on Jul 26, 2024. It is now read-only.

Commit

Permalink
chore: update rust (to 1.62.1, the latest circleci image) (#435)
Browse files Browse the repository at this point in the history
switching from the deprecated circleci namespace to cimg and pinning
CI's rust version to match the Dockerfile's

also update clippy per 1.63.0
  • Loading branch information
pjenvey authored Aug 15, 2022
1 parent 8e43e07 commit 58007a3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ commands:
jobs:
checks:
docker:
- image: circleci/rust:latest
- image: cimg/rust:1.62
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand All @@ -100,7 +100,7 @@ jobs:

test:
docker:
- image: circleci/rust:latest
- image: cimg/rust:1.62
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand All @@ -116,7 +116,7 @@ jobs:

build:
docker:
- image: circleci/rust:latest
- image: cimg/rust:1.62
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ARG APPNAME=contile

# make sure that the build and run environments are the same version
FROM rust:1.60-slim-buster as builder
FROM rust:1.62-slim-buster as builder
ARG APPNAME
ADD . /app
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion src/server/img_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl StoredImage {
}
}

#[derive(Copy, Clone, Debug, Deserialize, Default, Serialize, PartialEq)]
#[derive(Copy, Clone, Debug, Deserialize, Default, Serialize, PartialEq, Eq)]
pub struct ImageMetrics {
pub width: u32,
pub height: u32,
Expand Down
2 changes: 1 addition & 1 deletion src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static PREFIX: &str = "contile";

static DEFAULT_PORT: u16 = 8000;

#[derive(Clone, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
pub enum TestModes {
TestTimeout,
TestFakeResponse,
Expand Down

0 comments on commit 58007a3

Please sign in to comment.