diff --git a/scripts/qa/Dockerfile.build b/scripts/qa/Dockerfile.build index 5c6bed57b..ae360aa23 100644 --- a/scripts/qa/Dockerfile.build +++ b/scripts/qa/Dockerfile.build @@ -13,10 +13,6 @@ COPY . pentoo #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 -# disable minimal (pentoo-core is default minimal) -RUN cat /etc/portage/make.conf -RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf - WORKDIR /var/db/repos/pentoo RUN ./scripts/qa/test-build $github_sha diff --git a/scripts/qa/test-build b/scripts/qa/test-build index c58e7c97f..ac284e7b3 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -6,13 +6,13 @@ if [ -z "${1:-}" ]; then fi set -x #if [ -z "$(git diff-tree --no-commit-id --name-only -r "${1}")" ]; then -if [ -z "$(git diff --name-only HEAD@{0} HEAD@{1})" ]; then +if [ -z "$(git --no-pager diff --name-only $(git rev-parse --verify master) HEAD)" ]; then printf "No changed files detected, nothing to do\n" exit 1 # this hits because the diff-tree command finds nothing despite working on my computer fi #for i in $(git diff-tree --no-commit-id --name-only -r "${1}"); do -for i in $(git diff --name-only HEAD@{0} HEAD@{1}); do +for i in $(git --no-pager diff --name-only $(git rev-parse --verify master) HEAD); do if [ "${i%.ebuild}" != "${i}" ]; then printf "%s looks like an ebuild, testing\n" "${i}" if FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "$(printf '%s' "${i%.ebuild}" | awk -F'/' '{print "="$1"/"$3}')" --pretend; then