From 15ffc4951e3112dbb81a07672dc8e98ee9f34b82 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Thu, 11 Jan 2024 21:30:32 -0500
Subject: [PATCH] oops forgot to bump 1.70.0 in flake and gitlab dockerfile
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
.gitlab-ci.yml | 2 +-
Dockerfile | 2 +-
flake.nix | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bf9e86f5..2fc6ca65a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,7 +116,7 @@ docker build debugging:
cargo check:
stage: test
- image: docker.io/rust:1.70.0-bullseye
+ image: docker.io/rust:1.74.1-bullseye
needs: []
interruptible: true
before_script:
diff --git a/Dockerfile b/Dockerfile
index 943f68644..655b2099f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
-FROM docker.io/rust:1.70-bullseye AS base
+FROM docker.io/rust:1.74.1-bullseye AS base
FROM base AS builder
WORKDIR /usr/src/conduit
diff --git a/flake.nix b/flake.nix
index d04c56d46..5b90b1a0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,7 @@
channel = cargoToml.package.rust-version;
# THE rust-version HASH
- sha256 = "sha256-gdYqng0y9iHYzYPAdkC/ka3DRny3La/S5G8ASj0Ayyc=";
+ sha256 = "sha256-PjvuouwTsYfNKW5Vi5Ye7y+lL7SsWGBxCtBOOm2z14c=";
};
mkToolchain = fenix.packages.${system}.combine;
--
GitLab