Skip to content

Conversation

nevermarine
Copy link
Collaborator

@nevermarine nevermarine commented Sep 10, 2025

Description

Build:

  • libxkbcommon: xkbcommon-1.10.0

Refactor build:

  • gcc: releases/gcc-13.2.0
  • glib2: 2.84.2

Why do we need it, and what problem does it solve?

What is the expected result?

Checklist

  • The code is covered by unit tests.
  • e2e tests passed.
  • Documentation updated according to the changes.
  • Changes were tested in the Kubernetes cluster manually.

Changelog entries

section: ci
type: chore
summary: import glib2, libxkbcommon, libstdc++6

Summary by Sourcery

Import glib2, libxkbcommon, util-linux, and libstdc++6 dependencies into CI image builds and add a dedicated libxkbcommon package image.

New Features:

  • Add new libxkbcommon werf images with source, builder, and README files.

Build:

  • Bump component versions: GCC to 13.2.0, glib2 to 2.84.2, SELinux to 3.8, and introduce libxkbcommon 1.10.0.
  • Include glib2, util-linux, and libxkbcommon packages across multiple image build configs.
  • Add libstdc++.so.6 to GCC image includePaths

Signed-off-by: Maksim Fedotov <[email protected]>
@nevermarine nevermarine added this to the v1.1.0 milestone Sep 10, 2025
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
@nevermarine nevermarine marked this pull request as ready for review September 15, 2025 14:46
@nevermarine nevermarine added the e2e/run Run e2e test on cluster of PR author label Sep 15, 2025
@nevermarine nevermarine changed the title chore(ci): import glib2 chore(ci): import glib2, libxkbcommon, libstdc++6 Sep 15, 2025
@deckhouse-BOaTswain
Copy link
Contributor

deckhouse-BOaTswain commented Sep 15, 2025

Workflow has started.
Follow the progress here: Workflow Run

The target step completed with status: success.

@deckhouse-BOaTswain deckhouse-BOaTswain removed the e2e/run Run e2e test on cluster of PR author label Sep 15, 2025
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
Signed-off-by: Maksim Fedotov <[email protected]>
@nevermarine nevermarine marked this pull request as draft September 22, 2025 09:52
@nevermarine nevermarine marked this pull request as ready for review September 29, 2025 14:22
Copy link

sourcery-ai bot commented Sep 29, 2025

Reviewer's Guide

This PR refactors the CI image build configurations to import and manage three core components—glib2, libxkbcommon, and libstdc++6—by updating version pins, introducing a new libxkbcommon package definition, enhancing the GCC image to include libstdc++6, adding glib2 into multiple image dependencies, and streamlining the package build scripts.

Class diagram for new libxkbcommon package definition

classDiagram
  class Libxkbcommon {
    +xkbcli: binary
    +libxkbcommon.so: shared library
    +libxkbcommon-x11.so: shared library
    +libxkbregistry.so: shared library
    +xkbcommon.h, xkbcommon-x11.h, xkbcommon-compose.h, xkbregistry.h: headers
    +xkbcli-* tools: binaries
  }
  class PackageBuilder {
    +meson
    +ninja-build
    +strip
    +tree
    +git clone
    +import dependencies
  }
  Libxkbcommon <|-- PackageBuilder
Loading

File-Level Changes

Change Details Files
Bump component versions and add libxkbcommon to version manifest
  • Bump gcc from 14.2.0 to 13.2.0
  • Update glib2 to 2.84.2 and selinux to 3.8
  • Add libxkbcommon version xkbcommon-1.10.0
build/components/versions.yml
Introduce libxkbcommon as a new package image
  • Add werf.inc.yaml for libxkbcommon with src-artifact, builder, and final images
  • Include Meson/Ninja build steps and strip executables
  • Add README.md documenting the installed file tree
images/packages/libxkbcommon/werf.inc.yaml
images/packages/libxkbcommon/README.md
Integrate libstdc++6 into GCC image and downstream dependencies
  • Add usr/lib64/libstdc++.so.6 to GCC includePaths
  • Include libgcc1 and libstdc++ in QEMU, nbdkit, virt-launcher, and other images’ package lists
images/packages/gcc/werf.inc.yaml
images/qemu/werf.inc.yaml
images/packages/nbdkit/werf.inc.yaml
images/virt-launcher/werf.inc.yaml
Import glib2 into CI images and refine its build definition
  • Update glib2 werf.inc.yaml to add util-linux and selinux, enable libmount and dual-library output
  • Add glib2 to dependent images for glib-util packages
  • Streamline importPackageImages usage for builder dependencies
images/packages/glib2/werf.inc.yaml
images/packages/libjson-glib/werf.inc.yaml
images/libvirt/werf.inc.yaml
images/packages/swtpm/werf.inc.yaml
images/packages/e2fsprogs/werf.inc.yaml
images/packages/libpsl/werf.inc.yaml
images/packages/p11-kit/werf.inc.yaml
Streamline package build scripts and documentation
  • Replace manual SSH setup with direct git clone in GCC install step
  • Simplify selinux README by trimming the file tree output
  • Use importPackageImages macro and unified install loops across multiple werf.inc.yaml files
images/packages/gcc/werf.inc.yaml
images/packages/selinux/README.md
images/packages/libjson-glib/werf.inc.yaml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants