summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2025-07-01 01:55:25 +0100
committerSam James <sam@gentoo.org>2025-10-29 05:13:18 +0000
commitaac2f8223e392b4a1d53b66ad5172e528c625f2b (patch)
tree525ccac4fa0cbe19201ec79864e89cfff548c45f /ci
parentcdd6a3de23e6d00e9ee774c5479326dffa79195f (diff)
downloadmeson-aac2f8223e392b4a1d53b66ad5172e528c625f2b.tar.gz
ci: gentoo: cleanup old Python commentary/entries
This dates back to before we changed to Python 3.12 default in Gentoo. I don't remember why we specifically wanted/needed 3.12 in the CI builder though (maybe something to do with distutils removal to test that). The Python changes here shouldn't make much difference to binpkg eligibility right now because the binhost has a double builder for old targets, though it won't cover everything. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'ci')
-rwxr-xr-xci/ciimage/gentoo/install.sh24
1 files changed, 13 insertions, 11 deletions
diff --git a/ci/ciimage/gentoo/install.sh b/ci/ciimage/gentoo/install.sh
index 700e4e9db..584584e8e 100755
--- a/ci/ciimage/gentoo/install.sh
+++ b/ci/ciimage/gentoo/install.sh
@@ -70,7 +70,6 @@ pkgs_stable=(
#x11-libs/gtk+:3
)
pkgs_latest=(
- # ~arch boost needed for py3.12 for now (needs 1.84)
dev-build/b2
dev-libs/boost
@@ -134,17 +133,20 @@ cat <<-EOF >> /etc/portage/make.conf
FEATURES="\${FEATURES} -ipc-sandbox -network-sandbox -pid-sandbox"
EOF
-# TODO: Enable all Pythons / add multiple jobs with diff. Python impls?
+# Maybe we could enable all Pythons / add multiple jobs with diff. Python impls?
#echo '*/* PYTHON_TARGETS: python3_10 python3_11 python3_12' >> /etc/portage/package.use/python
-echo '*/* PYTHON_TARGETS: python3_12' >> /etc/portage/package.use/python
-cat <<-EOF >> /etc/portage/profile/use.mask
--python_targets_python3_12
--python_single_target_python3_12
-EOF
-cat <<-EOF >> /etc/portage/profile/use.stable.mask
--python_targets_python3_12
--python_single_target_python3_12
-EOF
+
+# The below is for cases where we want non-default Python (either to get
+# better coverage from something older, or something newer)
+#echo '*/* PYTHON_TARGETS: python3_12' >> /etc/portage/package.use/python
+#cat <<-EOF >> /etc/portage/profile/use.mask
+#-python_targets_python3_12
+#-python_single_target_python3_12
+#EOF
+#cat <<-EOF >> /etc/portage/profile/use.stable.mask
+#-python_targets_python3_12
+#-python_single_target_python3_12
+#EOF
echo 'dev-lang/python ensurepip' >> /etc/portage/package.use/python