Skip to content

Commit f517487

Browse files
eli-schwartzthesamesam
authored andcommitted
ci: gentoo: use a slimmer base image
We've been using the desktop profile until now, mostly because it automatically provides various frameworks we test e.g. wayland, gtk, qt etc that all install out of the box. It also guarantees that binpackages match. The image is also really fat though. :( Switch to the base profile, install a few packages that otherwise wouldn't be installed, and tweak individual USE flags for binary coverage.
1 parent d4c9536 commit f517487

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

‎ci/ciimage/gentoo/image.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"base_image": "gentoo/stage3:desktop",
2+
"base_image": "gentoo/stage3:latest",
33
"env": {
44
"CI": "1",
55
"MESON_CI_JOBNAME": "linux-gentoo-gcc",

‎ci/ciimage/gentoo/install.sh‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,16 @@ pkgs_stable=(
2323
dev-util/bindgen
2424

2525
dev-libs/elfutils
26+
dev-libs/protobuf
27+
28+
# modules
2629
dev-util/gdbus-codegen
30+
dev-util/glib-utils
2731
dev-libs/gobject-introspection
2832
dev-util/itstool
29-
dev-libs/protobuf
33+
dev-util/wayland-scanner
34+
dev-libs/wayland-protocols
35+
dev-libs/wayland
3036

3137
# custom deps
3238
dev-libs/boost
@@ -39,15 +45,21 @@ pkgs_stable=(
3945
dev-cpp/gtest
4046
sci-libs/hdf5
4147
dev-qt/linguist-tools
48+
dev-qt/qtwidgets:5
4249
llvm-core/llvm
4350
dev-qt/qttools
51+
net-print/cups
52+
dev-util/vulkan-headers
53+
media-libs/vulkan-loader
4454

4555
# misc
4656
app-admin/sudo
4757
app-text/doxygen
4858
sys-devel/bison
4959
sys-devel/reflex
5060
sys-devel/gettext
61+
# needed by vala
62+
x11-libs/gtk+
5163

5264
# TODO: vulkan-validation-layers
5365
# TODO: cuda
@@ -60,9 +72,6 @@ pkgs_stable=(
6072
#dev-libs/wayland
6173
#dev-libs/wayland-protocols
6274
#dev-python/pypy3
63-
#dev-qt/qtbase:6
64-
#dev-qt/qtcore:5
65-
#dev-qt/qttools:6
6675
#dev-vcs/mercurial
6776
#gnustep-base/gnustep-base
6877
#media-gfx/graphviz
@@ -100,10 +109,16 @@ mkdir /etc/portage/binrepos.conf || true
100109
mkdir /etc/portage/profile || true
101110
cat <<-EOF > /etc/portage/package.use/ci
102111
dev-cpp/gtkmm X
112+
media-libs/libglvnd X
113+
x11-libs/cairo X
114+
x11-libs/libxkbcommon X
103115
dev-lang/rust clippy rustfmt
104116
dev-lang/rust-bin clippy rustfmt
105117
dev-libs/boost python
106118
119+
# slimmed binpkg, nomesa
120+
media-libs/libsdl2 -opengl -wayland -alsa -dbus -gles2 -udev -vulkan
121+
107122
# Some of these settings are needed just to get the binpkg but
108123
# aren't negative to have anyway
109124
sys-devel/gcc ada d jit

0 commit comments

Comments
 (0)