diff --git a/.github/workflows/pentoo-binpkgs.yaml b/.github/workflows/pentoo-binpkgs.yaml new file mode 100644 index 000000000..32d1ef9ee --- /dev/null +++ b/.github/workflows/pentoo-binpkgs.yaml @@ -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 diff --git a/.github/workflows/pentoo-visibility.yaml b/.github/workflows/pentoo-visibility.yaml index 4cfc10e28..fc79d0c50 100644 --- a/.github/workflows/pentoo-visibility.yaml +++ b/.github/workflows/pentoo-visibility.yaml @@ -2,7 +2,7 @@ name: Pentoo Visibility Check on: schedule: - - cron: "3 * * * *" + - cron: "6 * * * *" pull_request: branches: - master diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2025.3-r3.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2026.0.ebuild similarity index 97% rename from pentoo/pentoo-desktop/pentoo-desktop-2025.3-r3.ebuild rename to pentoo/pentoo-desktop/pentoo-desktop-2026.0.ebuild index bd9365fbd..455b72ed7 100644 --- a/pentoo/pentoo-desktop/pentoo-desktop-2025.3-r3.ebuild +++ b/pentoo/pentoo-desktop/pentoo-desktop-2026.0.ebuild @@ -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 ) diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index 2c707314c..00c74ad7c 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -70,8 +70,5 @@ sci-libs/mkl =dev-python/ipykernel-7.1.0 - -# Gentoo bug: https://bugs.gentoo.org/969510 -=dev-util/unicorn-2.1.4 +# force ffmpeg update +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 diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility index 03b069093..29766e08f 100644 --- a/scripts/qa/Dockerfile.visibility +++ b/scripts/qa/Dockerfile.visibility @@ -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 diff --git a/scripts/qa/test-build b/scripts/qa/test-build index 8cc668601..fc28703d4 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -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'