Switch to complete Rust image to avoid component installation issues
Some checks failed
Build deb-bootupd Artifacts / Build deb-bootupd Artifacts (push) Failing after 3m24s
Simple Build & Upload / build (push) Failing after 1m27s

- Change from rust:1.89-slim-trixie to rust:1.89 (full image)
- Remove manual rustup component add clippy and rustfmt
- Full rust:1.89 image includes all components by default
- This eliminates the 'whack-a-mole' approach of adding packages one by one
- Update build info files to reflect new container image
- Should resolve all missing component errors in CI/CD
This commit is contained in:
robojerk 2025-08-10 00:34:02 -07:00
parent 2ba0a2c5ff
commit ec795735cd
2 changed files with 12 additions and 21 deletions

View file

@ -31,9 +31,9 @@ jobs:
name: Build deb-bootupd Artifacts name: Build deb-bootupd Artifacts
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
# Use official Rust image with Debian Trixie base - much better than manual Rust setup # Use complete Rust image with all components pre-installed
# Rust 1.89.0 is pre-installed and > 1.84.1 requirement # This avoids the "whack-a-mole" of adding components one by one
image: rust:1.89-slim-trixie image: rust:1.89
steps: steps:
- name: Setup build environment - name: Setup build environment
shell: bash shell: bash
@ -61,11 +61,8 @@ jobs:
# Install additional build dependencies # Install additional build dependencies
apt install -y libssl-dev libsystemd-dev file apt install -y libssl-dev libsystemd-dev file
# Install Rust clippy component # Rust 1.89 includes all components by default (clippy, rustfmt, etc.)
rustup component add clippy # No need to manually install components
# Install Rust rustfmt component
rustup component add rustfmt
- name: Checkout repository manually - name: Checkout repository manually
run: | run: |
@ -150,8 +147,8 @@ jobs:
deb-bootupd Build Information deb-bootupd Build Information
============================= =============================
Build Date: $(date) Build Date: $(date)
Container Image: rust:1.89
Debian Version: ${DEBIAN_VERSION} Debian Version: ${DEBIAN_VERSION}
Container Image: rust:1.89-slim-trixie
Rust Version: $(rustc --version) Rust Version: $(rustc --version)
Cargo Version: $(cargo --version) Cargo Version: $(cargo --version)
Git Commit: $(git rev-parse --short HEAD) Git Commit: $(git rev-parse --short HEAD)
@ -224,7 +221,7 @@ jobs:
========================= =========================
Build Date: $(date) Build Date: $(date)
Debian Version: ${DEBIAN_VERSION} Debian Version: ${DEBIAN_VERSION}
Container Image: rust:1.89-slim-trixie Container Image: rust:1.89
Rust Version: $(rustc --version) Rust Version: $(rustc --version)
Git Commit: $(git rev-parse --short HEAD) Git Commit: $(git rev-parse --short HEAD)
Git Branch: $(git branch --show-current) Git Branch: $(git branch --show-current)

View file

@ -14,23 +14,17 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
# Use official Rust image with Debian Trixie base - much better than manual Rust setup # Use complete Rust image with all components pre-installed
# Rust 1.89.0 is pre-installed and > 1.84.1 requirement # This avoids the "whack-a-mole" of adding components one by one
image: rust:1.89-slim-trixie image: rust:1.89
steps: steps:
- name: Checkout code and setup environment - name: Checkout code and setup environment
run: | run: |
apt update -y apt update -y
apt install -y git curl pkg-config libssl-dev libsystemd-dev build-essential file apt install -y git curl pkg-config libssl-dev libsystemd-dev build-essential file
# Install Rust clippy component # Rust 1.89.0 is already installed with all components in rust:1.89
rustup component add clippy # No need for manual component installation!
# Install Rust rustfmt component
rustup component add rustfmt
# Rust 1.89.0 is already installed in rust:1.89-slim-trixie
# No need for rustup or toolchain management!
echo "✅ Using pre-installed Rust from official image:" echo "✅ Using pre-installed Rust from official image:"
rustc --version rustc --version
cargo --version cargo --version