From 3a669cd9c7e0edb4f18cdca46a4cc2d7fdd67ee3 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 13:25:46 -0400 Subject: [PATCH 1/7] workflows: merge pkgcheck and pkgcheck_merge --- .github/workflows/pkgcheck.yaml | 5 ++++- .github/workflows/pkgcheck_merge.yaml | 29 --------------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 .github/workflows/pkgcheck_merge.yaml diff --git a/.github/workflows/pkgcheck.yaml b/.github/workflows/pkgcheck.yaml index 516a50249..1d8284bae 100644 --- a/.github/workflows/pkgcheck.yaml +++ b/.github/workflows/pkgcheck.yaml @@ -2,6 +2,9 @@ name: pkgcheck on: push: branches: [master] + pull_request: + branches: + - master jobs: build: @@ -25,4 +28,4 @@ jobs: - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 with: - args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} + args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} diff --git a/.github/workflows/pkgcheck_merge.yaml b/.github/workflows/pkgcheck_merge.yaml deleted file mode 100644 index 290924ca1..000000000 --- a/.github/workflows/pkgcheck_merge.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: pkgcheck_merge -on: - pull_request: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Tree-wide pkgcheck pentoo-ci - uses: pkgcore/pkgcheck-action@v1 - with: - args: -C PentooCI --exit PentooCI --net - - - name: Tree-wide pkgcheck error check - uses: pkgcore/pkgcheck-action@v1 - with: - args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,-MasterPackageClobbered - - - name: Commit pkgcheck warnings - uses: pkgcore/pkgcheck-action@v1 - with: - args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} From 4d7220edf29a97ccca4f41fdc0ea5f1d7335cbd5 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 14:01:38 -0400 Subject: [PATCH 2/7] all new emerge --pretend check --- .github/workflows/pentoo-visibility.yaml | 26 ++++++++++++++++++++++++ scripts/qa/Dockerfile | 19 +++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .github/workflows/pentoo-visibility.yaml create mode 100644 scripts/qa/Dockerfile diff --git a/.github/workflows/pentoo-visibility.yaml b/.github/workflows/pentoo-visibility.yaml new file mode 100644 index 000000000..6cbbdef9a --- /dev/null +++ b/.github/workflows/pentoo-visibility.yaml @@ -0,0 +1,26 @@ +name: Pentoo Visibility Check + +on: + pull_request: + branches: + - master + +jobs: + pentoo-visibility-check: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + 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: Visibility Check + run: | + sudo docker build --progress=plain . -f scripts/qa/Dockerfile diff --git a/scripts/qa/Dockerfile b/scripts/qa/Dockerfile new file mode 100644 index 000000000..0d48925f9 --- /dev/null +++ b/scripts/qa/Dockerfile @@ -0,0 +1,19 @@ +FROM pentoolinux/pentoo-core + +#setup gentoo repo +WORKDIR /var/db/repos/ +RUN git clone https://github.com/gentoo/gentoo.git --depth 1 +#RUN git clone https://github.com/pentoo/pentoo-overlay.git pentoo --depth 1 +COPY . pentoo +RUN pwd +RUN ls -al +RUN ls -al pentoo +#RUN emerge --regen --jobs=$(nproc) --quiet +WORKDIR /home +#RUN sed -i 's#pentoo-in-a-container#pentoo-in-a-container -pentoo-full#' /etc/portage/make.conf +#disable minimal +RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf +#install libsndfile minimal to break circular deps +#RUN USE=minimal FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse media-libs/libsndfile +#install pentoo/pentoo +RUN FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend From bb1cb8d4aca752cc5d98796b3be6f2b2c91c59e4 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 14:02:54 -0400 Subject: [PATCH 3/7] pkgcheck workflow, more net --- .github/workflows/pkgcheck.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkgcheck.yaml b/.github/workflows/pkgcheck.yaml index 1d8284bae..2cc2ea787 100644 --- a/.github/workflows/pkgcheck.yaml +++ b/.github/workflows/pkgcheck.yaml @@ -23,9 +23,9 @@ jobs: - name: Tree-wide pkgcheck error check uses: pkgcore/pkgcheck-action@v1 with: - args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,NonexistentDeps,-MasterPackageClobbered + args: --net --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,NonexistentDeps,-MasterPackageClobbered - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 with: - args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} + args: --net --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} From a2f4eb8963bfcf1b213a0f8805a1a2179488a82e Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 14:07:48 -0400 Subject: [PATCH 4/7] visibility workflow: add time --- scripts/qa/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/qa/Dockerfile b/scripts/qa/Dockerfile index 0d48925f9..e3bb4298c 100644 --- a/scripts/qa/Dockerfile +++ b/scripts/qa/Dockerfile @@ -4,10 +4,8 @@ FROM pentoolinux/pentoo-core WORKDIR /var/db/repos/ RUN git clone https://github.com/gentoo/gentoo.git --depth 1 #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 -RUN pwd -RUN ls -al -RUN ls -al pentoo #RUN emerge --regen --jobs=$(nproc) --quiet WORKDIR /home #RUN sed -i 's#pentoo-in-a-container#pentoo-in-a-container -pentoo-full#' /etc/portage/make.conf @@ -16,4 +14,4 @@ RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf #install libsndfile minimal to break circular deps #RUN USE=minimal FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse media-libs/libsndfile #install pentoo/pentoo -RUN 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 FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" time emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend From b46f6700ea22ec863b5a2b9bb80ba456bc234cde Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 14:09:49 -0400 Subject: [PATCH 5/7] pentoo-system drop masked app-crypt/yubikey-manager-qt --- ...o-system-2025.1.ebuild => pentoo-system-2025.2.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename pentoo/pentoo-system/{pentoo-system-2025.1.ebuild => pentoo-system-2025.2.ebuild} (94%) diff --git a/pentoo/pentoo-system/pentoo-system-2025.1.ebuild b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild similarity index 94% rename from pentoo/pentoo-system/pentoo-system-2025.1.ebuild rename to pentoo/pentoo-system/pentoo-system-2025.2.ebuild index 2a577df64..ab3cf3b1b 100644 --- a/pentoo/pentoo-system/pentoo-system-2025.1.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild @@ -26,14 +26,14 @@ PDEPEND="${PDEPEND} !pentoo-minimal? ( !pentoo-in-a-container? ( sys-apps/fwupd ) ) video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions ) ) - 2fa? ( X? ( app-crypt/yubikey-manager-qt - sys-auth/yubikey-personalization-gui - ) + 2fa? ( + X? (sys-auth/yubikey-personalization-gui ) app-crypt/yubikey-manager app-crypt/ccid app-crypt/libu2f-host app-crypt/libu2f-server - sys-auth/pam_yubico ) + sys-auth/pam_yubico + ) !arm? ( app-portage/cpuid2cpuflags ) windows-compat? ( app-emulation/wine-vanilla )" From 2ea0f7ca13b11f7241ea800b2e98754a81db5eaa Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 14:12:58 -0400 Subject: [PATCH 6/7] visibility: fix timer --- scripts/qa/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qa/Dockerfile b/scripts/qa/Dockerfile index e3bb4298c..d4cce393d 100644 --- a/scripts/qa/Dockerfile +++ b/scripts/qa/Dockerfile @@ -14,4 +14,4 @@ RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf #install libsndfile minimal to break circular deps #RUN USE=minimal FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse media-libs/libsndfile #install pentoo/pentoo -RUN FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" time emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend +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 From cc56a99cddd4b8ba16242834d75e05bfc90287bc Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 23 Aug 2025 14:16:05 -0400 Subject: [PATCH 7/7] pentoo-system: I need my space --- pentoo/pentoo-system/pentoo-system-2025.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pentoo/pentoo-system/pentoo-system-2025.2.ebuild b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild index ab3cf3b1b..7dcc0ffd4 100644 --- a/pentoo/pentoo-system/pentoo-system-2025.2.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild @@ -27,7 +27,7 @@ PDEPEND="${PDEPEND} video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions ) ) 2fa? ( - X? (sys-auth/yubikey-personalization-gui ) + X? ( sys-auth/yubikey-personalization-gui ) app-crypt/yubikey-manager app-crypt/ccid app-crypt/libu2f-host