From b4f689598102f45f912f263a11f51bb99f56d3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Sun, 15 Dec 2024 16:11:31 +0100 Subject: [PATCH] ci: addendum to 7ac7c5774b85e81c933e848add9aca4332231af2 --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 4 ++-- .github/workflows/ci.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9cb8f9b02..8c4351e9a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/rust/.devcontainer/base.Dockerfile -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye -ARG VARIANT="buster" +# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye, bookworm +ARG VARIANT="bookworm" FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 92f97a4c1..6834a8cdd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,9 +5,9 @@ "build": { "dockerfile": "Dockerfile", "args": { - // Use the VARIANT arg to pick a Debian OS version: buster, bullseye + // Use the VARIANT arg to pick a Debian OS version: buster, bullseye, bookworm // Use bullseye when on local on arm64/Apple Silicon. - "VARIANT": "bullseye" + "VARIANT": "bookworm" } }, "runArgs": [ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 845f37220..73520e91a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -394,7 +394,7 @@ jobs: runs-on: ubuntu-latest - container: debian:bullseye-slim@sha256:8118d0da5204dcc2f648d416b4c25f97255a823797aeb17495a01f2eb9c1b487 + container: debian:bookworm-slim # Benchmark failure is not critical enough to fail the whole workflow. # We will keep an eye on them anyway, though