From 44503ddd82a02e9de8b58770b9419e1d38858efb Mon Sep 17 00:00:00 2001 From: slydetector Date: Tue, 28 Apr 2026 02:20:42 +0000 Subject: [PATCH] Devcontainer: Install rust via devcontainer feature --- .devcontainer/devcontainer.json | 3 +++ .devcontainer/features/ladybird/install-fedora.sh | 3 --- .devcontainer/features/ladybird/install-ubuntu.sh | 3 --- .devcontainer/fedora-ci/devcontainer.json | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index da96ea93b2..2acd1372fc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,6 +5,9 @@ "features": { "ghcr.io/devcontainers/features/github-cli:1": {}, "ghcr.io/devcontainers-extra/features/pre-commit:2": {}, + "ghcr.io/devcontainers/features/rust:1": { + "profile": "default" + }, "./features/ladybird": { "llvm_version": 20 }, diff --git a/.devcontainer/features/ladybird/install-fedora.sh b/.devcontainer/features/ladybird/install-fedora.sh index fa3f3423e0..26b85fbe60 100644 --- a/.devcontainer/features/ladybird/install-fedora.sh +++ b/.devcontainer/features/ladybird/install-fedora.sh @@ -8,6 +8,3 @@ dnf install -y git gh dnf install -y autoconf-archive automake bison ccache cmake curl google-noto-sans-mono-fonts liberation-sans-fonts \ libglvnd-devel libtool nasm ninja-build patchelf perl-FindBin perl-IPC-Cmd perl-lib qt6-qtbase-devel \ qt6-qttools-devel qt6-qtwayland-devel tar unzip zip zlib-ng-compat-static - -# Install Rust toolchain -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/.devcontainer/features/ladybird/install-ubuntu.sh b/.devcontainer/features/ladybird/install-ubuntu.sh index bf05dfc85c..1ea18ff750 100644 --- a/.devcontainer/features/ladybird/install-ubuntu.sh +++ b/.devcontainer/features/ladybird/install-ubuntu.sh @@ -26,9 +26,6 @@ install_llvm_key() { apt update -y apt install -y lsb-release git python3 autoconf autoconf-archive automake bison build-essential cmake libdrm-dev libgl1-mesa-dev libtool libxkbcommon-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland ccache fonts-liberation2 zip unzip curl tar -### Install Rust toolchain -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - ### Ensure new enough host compiler is available VERSION="0.0.0" diff --git a/.devcontainer/fedora-ci/devcontainer.json b/.devcontainer/fedora-ci/devcontainer.json index 12ee845c44..281d3416ff 100644 --- a/.devcontainer/fedora-ci/devcontainer.json +++ b/.devcontainer/fedora-ci/devcontainer.json @@ -13,6 +13,9 @@ // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/common-utils:2": {}, + "ghcr.io/devcontainers/features/rust:1": { + "profile": "default" + }, "../features/ladybird" : { "distro": "fedora" }