Compare commits

...

4 commits

Author SHA1 Message Date
c6e3d714a7 build: upgrade docker image to use debian:stable-20240722-slim
All checks were successful
Rust / build (push) Successful in 1m22s
ci/woodpecker/push/cron-docker-builder Pipeline was successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful
2024-08-04 10:03:52 +01:00
c27d891b65 build: upgrade git-next-builder to 2024-08-04
All checks were successful
Rust / build (push) Successful in 1m42s
ci/woodpecker/push/cron-docker-builder Pipeline was successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful
2024-08-04 10:03:52 +01:00
347b9cb4dc build: add missing dependency libdbus-1-dev to correct Dockerfile
All checks were successful
Rust / build (push) Successful in 1m17s
ci/woodpecker/push/cron-docker-builder Pipeline was successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful
2024-08-04 10:03:52 +01:00
5d64692f31 test: timing test waits longer than expiry
All checks were successful
Rust / build (push) Successful in 1m52s
ci/woodpecker/push/cron-docker-builder Pipeline was successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful
2024-08-04 10:03:52 +01:00
2 changed files with 5 additions and 2 deletions

View file

@ -1,6 +1,6 @@
# Leveraging the pre-built Docker images with # Leveraging the pre-built Docker images with
# cargo-chef and the Rust toolchain # cargo-chef and the Rust toolchain
FROM git.kemitix.net/kemitix/git-next-builder:2024.07.05 AS chef FROM git.kemitix.net/kemitix/git-next-builder:2024.08.04 AS chef
WORKDIR /app WORKDIR /app
FROM chef AS planner FROM chef AS planner
@ -15,12 +15,13 @@ COPY . .
RUN cargo build --release --bin git-next && \ RUN cargo build --release --bin git-next && \
strip target/release/git-next strip target/release/git-next
FROM docker.io/debian:stable-20240701-slim AS runtime FROM docker.io/debian:stable-20240722-slim AS runtime
WORKDIR /app WORKDIR /app
RUN apt-get update && \ RUN apt-get update && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
git=1:2.39.2-1.1 \ git=1:2.39.2-1.1 \
libssl3=3.0.13-1~deb12u1 \ libssl3=3.0.13-1~deb12u1 \
libdbus-1-dev=1.14.10-1~deb12u1 \
ca-certificates=20230311 \ ca-certificates=20230311 \
&& \ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

View file

@ -35,6 +35,8 @@ fn when_history_has_expired_then_message_is_passed() {
let result = history.sendable(user_notification); let result = history.sendable(user_notification);
let_assert!(Some(user_notification) = result); let_assert!(Some(user_notification) = result);
std::thread::sleep(dur);
// twice the expiry duration to avoid things happening in the wrong order
std::thread::sleep(dur); std::thread::sleep(dur);
// after dur, message has expired, so is still valid // after dur, message has expired, so is still valid