diff --git a/.github/workflows/pentoo-build-test.yaml b/.github/workflows/pentoo-build-test.yaml index d9b1bb131..e7426a8ed 100644 --- a/.github/workflows/pentoo-build-test.yaml +++ b/.github/workflows/pentoo-build-test.yaml @@ -19,8 +19,8 @@ jobs: uses: docker/setup-buildx-action@v3 - name: List added files - run: git diff-tree --no-commit-id --name-only -r ${{ github.sha }} + run: git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD - name: Pentoo Build Test run: | - sudo docker build --progress=plain --build-arg github_sha="${{ github.sha }}" . -f scripts/qa/Dockerfile.build + sudo docker build --progress=plain . -f scripts/qa/Dockerfile.build diff --git a/scripts/qa/Dockerfile.build b/scripts/qa/Dockerfile.build index ae360aa23..97815c331 100644 --- a/scripts/qa/Dockerfile.build +++ b/scripts/qa/Dockerfile.build @@ -1,5 +1,4 @@ FROM pentoolinux/pentoo-full -ARG github_sha # Setup repos WORKDIR /var/db/repos/ # setup gentoo repo @@ -15,4 +14,4 @@ COPY . pentoo WORKDIR /var/db/repos/pentoo -RUN ./scripts/qa/test-build $github_sha +RUN ./scripts/qa/test-build diff --git a/scripts/qa/test-build b/scripts/qa/test-build index 5c129e962..43c535620 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -1,17 +1,5 @@ #!/bin/bash FAILED="0" -if [ -z "${1:-}" ]; then - printf 'Must pass github.sha as argument 1\n' - exit 1 -fi -set -x -#if [ -z "$(git diff-tree --no-commit-id --name-only -r "${1}")" ]; then -if [ -z "$(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" 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 --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do if [ "${i%.ebuild}" != "${i}" ]; then printf "%s looks like an ebuild, testing\n" "${i}" @@ -23,6 +11,8 @@ for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/mast printf '%s build FAILED\n' "${i}" FAILED="1" fi + else + printf '%s appears to be masked, skipping build test\n' fi fi done