Merge branch 'master' into master

This commit is contained in:
Zero_Chaos 2026-02-03 21:52:29 -05:00 committed by GitHub
commit 6d74615416
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 71 additions and 17 deletions

28
.github/workflows/pentoo-binpkgs.yaml vendored Normal file
View file

@ -0,0 +1,28 @@
name: Pentoo Binpkg Check
on:
schedule:
- cron: "6 * * * *"
pull_request:
branches:
- master
jobs:
pentoo-binpkg-check:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v5
with:
fetch-depth: 0
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: List added files
run: git diff-tree --no-commit-id --name-only -r ${{ github.sha }}
-
name: Binpkg Check
run: |
sudo docker build --progress=plain . -f scripts/qa/Dockerfile.binpkg

View file

@ -2,7 +2,7 @@ name: Pentoo Visibility Check
on:
schedule:
- cron: "3 * * * *"
- cron: "6 * * * *"
pull_request:
branches:
- master

View file

@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -41,9 +41,7 @@ PDEPEND="X? (
pulseaudio? (
|| ( kde? ( media-sound/pavucontrol-qt ) media-sound/pavucontrol )
)
vnc? (
|| ( kde? ( kde-apps/krdc ) net-misc/tigervnc )
)
vnc? ( kde? ( kde-apps/krdc ) )
firefox? (
pentoo-in-a-container? (
|| ( www-client/firefox-bin www-client/firefox )

View file

@ -70,8 +70,5 @@ sci-libs/mkl
<llvm-core/llvm-18
<llvm-core/clang-18
# Gentoo bug: https://bugs.gentoo.org/968358
>=dev-python/ipykernel-7.1.0
# Gentoo bug: https://bugs.gentoo.org/969510
=dev-util/unicorn-2.1.4
# force ffmpeg update
<media-video/ffmpeg-7.1.3

View file

@ -3,7 +3,7 @@ net-misc/modemmanager mbim
net-misc/networkmanager connection-sharing nftables
net-misc/ntpsec rclock_gpsd rclock_generic rclock_shm rclock_pps rclock_nmea rclock_modem
net-misc/openssh ldns security-key xmss -ldap
net-misc/remmina rdp spice ssh vnc zeroconf
net-misc/remmina gvnc rdp spice ssh vnc zeroconf
net-misc/spice-gtk gtk3 python usbredir
net-vpn/openvpn -static
net-vpn/tor nat-pmp tor-hardening transparent-proxy upnp threads

View file

@ -0,0 +1,22 @@
FROM pentoolinux/pentoo-core
# Setup repos
WORKDIR /var/db/repos/
# setup gentoo repo
RUN git clone https://github.com/gentoo/gentoo.git --depth 1
# setup pentoo repo
#RUN git clone https://github.com/pentoo/pentoo-overlay.git pentoo --depth 1
# Use the github checkout for pentoo, that's what we are testing
COPY . pentoo
#Regen doubles the time it takes for the action to run
#Revisit if this is worth running when we have >2 emerge calls
#RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs=$(nproc) --quiet
WORKDIR /home
# disable minimal (pentoo-core is default minimal)
RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf
#test install pentoo/pentoo
RUN time FEATURES="getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend

View file

@ -19,4 +19,4 @@ WORKDIR /home
RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf
#test install pentoo/pentoo
RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend
RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=n --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend

View file

@ -14,10 +14,14 @@ dep_build() {
emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --onlydeps "${1}"
}
build() {
binpkg_build() {
emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}"
}
build() {
FEATURES="${FEATURES} -getbinpkg" emerge --getbinpkg=n --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}"
}
for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do
if [ "${i%.ebuild}" != "${i}" ]; then
test_ebuild="$(printf '%s' "${i%.ebuild}" | awk -F'/' '{print "="$1"/"$3}')"
@ -27,11 +31,16 @@ for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/mast
printf '%s appears to be unmasked, building deps\n' "${i}"
if dep_build "${test_ebuild}"; then
printf '%s deps have built, build testing\n' "${i}"
if build "${test_ebuild}"; then
printf '%s build SUCCESS\n' "${i}"
if binpkg_build "${test_ebuild}"; then
printf '%s binpkg build SUCCESS\n' "${i}"
else
printf '%s build FAILED\n' "${i}"
FAILED="1"
printf '%s binpkg build FAILED\n' "${i}"
if build "${test_ebuild}"; then
printf '%s build without binpkgs SUCCESS\n' "${i}"
else
printf '%s build without binpkgs also FAILED\n' "${i}"
FAILED="1"
fi
fi
else
printf 'WARNING WARNING WARNING\n'