<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/626ccf184aae0f39f290b7f41a453ee744b7abda">https://github.com/macports/macports-infrastructure/commit/626ccf184aae0f39f290b7f41a453ee744b7abda</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 626ccf1 re-enable shlock locking in deploy_archives.sh
</span>626ccf1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 626ccf184aae0f39f290b7f41a453ee744b7abda
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Nov 8 08:18:14 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> re-enable shlock locking in deploy_archives.sh
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62977
</span>---
buildbot/deploy_archives.sh | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/deploy_archives.sh b/buildbot/deploy_archives.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index e406744..96bb1f8 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/deploy_archives.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/deploy_archives.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,15 +12,18 @@ if [[ -z "$DLPATH" ]]; then
</span> DLPATH="./deployed_archives"
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Always lock, because multiple builders may be deploying files with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the same names at the same time, so unique subdirs are not enough.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/62977
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+NEED_LOCK=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # path where archives get uploaded to buildmaster
if [[ -z "$ULPATH" ]]; then
# workaround for buildbot not accepting WithProperties in env
if [[ -n "$1" ]]; then
ULPATH="$1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # assume a unique path is used per builder so no locking is needed
</span> else
ULPATH="./archive_staging"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- NEED_LOCK=1
</span> fi
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +40,20 @@ if [[ -n "$NEED_LOCK" ]]; then
</span> fi
echo Acquiring lock...
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lockfile $LOCKFILE -r -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ "`uname -s`" = "Darwin" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SLEPT=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ! shlock -f "$LOCKFILE" -p $$; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sleep 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let SLEPT="$SLEPT + 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ "$SLEPT" -gt 600 ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo Timeout acquiring lock, continuing anyway...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lockfile "$LOCKFILE" -r -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> fi
if [[ ! -d $ULPATH ]]; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +82,7 @@ if [[ -n "`ls ${ULPATH}`" ]]; then
</span> fi
fi
done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [[ -n "$DLHOST" ]]; then
rsync -rlDzv --ignore-existing ${ULPATH}/ ${DLHOST}:${DLPATH}
else
</pre><pre style='margin:0'>
</pre>