Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuporter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d4530008337c
Choose a base ref
...
head repository: haikuports/haikuporter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6d9c154e6021
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 26, 2021

  1. 2

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    6d9c154 View commit details
Showing with 17 additions and 12 deletions.
  1. +17 −12 buildmaster/docker/loop
29 changes: 17 additions & 12 deletions buildmaster/docker/loop
Original file line number Diff line number Diff line change
@@ -27,18 +27,7 @@ export PYTHONUNBUFFERED=1

exec 2>&1

while true
do
echo "$(date) updating tree and pruning packages of removed ports"
HEAD_REVISION=$(git rev-parse HEAD)
git pull --ff-only
if [ $(git rev-parse HEAD) = $HEAD_REVISION ]
then
echo "$(date) no new revision"
sleep $SUCCESS_WAIT
continue
fi

build_prep () {
CONSISTENCY_REPORT_FILE="$REPO_DIR/repo_consistency.txt"
echo "repo consistency report at $(git rev-parse HEAD)" \
> "$CONSISTENCY_REPORT_FILE"
@@ -48,24 +37,40 @@ do
>> "$CONSISTENCY_REPORT_FILE"

$HAIKUPORTER --debug --prune-package-repository
}

while true
do
echo "$(date) updating tree and pruning packages of removed ports"
HEAD_REVISION=$(git rev-parse HEAD)
git pull --ff-only

if [ -f buildmaster/do-everything ]; then
echo "$(date) buildmaster everything requested, starting"
echo ""

rm buildmaster/do-everything

build_prep
$BUILDMASTER everything
elif [ -f buildmaster/do-packages ]; then
LIST=$(cat buildmaster/do-packages | tr '\n' ' ')
echo "$(date) buildmaster list requested, starting the following:"
echo " $LIST"
echo ""
rm buildmaster/do-packages

build_prep
$BUILDMASTER build $LIST
elif [ $(git rev-parse HEAD) = $HEAD_REVISION ]; then
echo "$(date) no new revision"
sleep $SUCCESS_WAIT
continue
else
echo "$(date) starting buildmaster update"
echo ""

build_prep
$BUILDMASTER update
fi
RESULT=$?