mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-05-26 20:49:55 +00:00
chore: Upgrade rust
This also upbrades the debian version to trixie, because the new LLVM version doesn't seem to have a build
This commit is contained in:
@@ -17,7 +17,7 @@ inputs:
|
|||||||
llvm-version:
|
llvm-version:
|
||||||
description: 'LLVM version to install'
|
description: 'LLVM version to install'
|
||||||
required: false
|
required: false
|
||||||
default: '20'
|
default: '21'
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
llvm-version:
|
llvm-version:
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
The version of Debian that the Docker-based build process uses has been upgraded from Bookworm to Trixie, meaning that standalone binaries now have a minimum glibc of 2.41, and can no longer be used on distro versions from before 2025-01-30
|
||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
ARG RUST_VERSION=1
|
ARG RUST_VERSION=1
|
||||||
ARG DEBIAN_VERSION=bookworm
|
ARG DEBIAN_VERSION=trixie
|
||||||
|
|
||||||
FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx
|
FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx
|
||||||
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim-${DEBIAN_VERSION} AS base
|
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim-${DEBIAN_VERSION} AS base
|
||||||
@@ -10,7 +10,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean
|
|||||||
|
|
||||||
# Match Rustc version as close as possible
|
# Match Rustc version as close as possible
|
||||||
# rustc -vV
|
# rustc -vV
|
||||||
ARG LLVM_VERSION=21
|
ARG LLVM_VERSION=22
|
||||||
# ENV RUSTUP_TOOLCHAIN=${RUST_VERSION}
|
# ENV RUSTUP_TOOLCHAIN=${RUST_VERSION}
|
||||||
|
|
||||||
# Install repo tools
|
# Install repo tools
|
||||||
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
|||||||
--mount=type=cache,target=/var/lib/apt,sharing=locked \
|
--mount=type=cache,target=/var/lib/apt,sharing=locked \
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
pkg-config make jq \
|
pkg-config make jq \
|
||||||
wget curl git software-properties-common \
|
wget curl git lsb-release gpg \
|
||||||
file
|
file
|
||||||
# golang cmake
|
# golang cmake
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
[toolchain]
|
[toolchain]
|
||||||
profile = "minimal"
|
profile = "minimal"
|
||||||
channel = "1.92.0"
|
channel = "1.95.0"
|
||||||
components = [
|
components = [
|
||||||
# For rust-analyzer
|
# For rust-analyzer
|
||||||
"rust-src",
|
"rust-src",
|
||||||
|
|||||||
Reference in New Issue
Block a user