<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/96678e282d8f399f513d48fafcdeba226d85eec8">https://github.com/macports/macports-infrastructure/commit/96678e282d8f399f513d48fafcdeba226d85eec8</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 96678e2 build_deploy_prbot: Update to use go modules
</span>96678e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96678e282d8f399f513d48fafcdeba226d85eec8
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Fri Jun 12 00:31:53 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> build_deploy_prbot: Update to use go modules
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This no longer requires "manually" setting up parts of the src folder of
</span><span style='display:block; white-space:pre;color:#404040;'> $GOPATH, and since we now use go-1.14 to do this, we can just run "go
</span><span style='display:block; white-space:pre;color:#404040;'> get" followed by "go install" in the pr/prbot folder and the prbot
</span><span style='display:block; white-space:pre;color:#404040;'> binary will appear in $GOPATH/bin.
</span>---
jobs/build_deploy_prbot.sh | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/jobs/build_deploy_prbot.sh b/jobs/build_deploy_prbot.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 6728954..9db25c0 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/jobs/build_deploy_prbot.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/jobs/build_deploy_prbot.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,18 +28,19 @@ fi
</span> # Allow overriding the path to the go executable
GO=${GO:-go}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MPBOT_PACKAGE_NAME=github.com/macports/mpbot-github
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MPBOT_GITHUB_SRC=$GOPATH/src/$MPBOT_PACKAGE_NAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MPBOT_GITHUB_URL=https://github.com/macports/mpbot-github
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MPBOT_GITHUB_SRC=/var/www/prbot/mpbot-github
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MPBOT_GITHUB_SUBFOLDER=pr/prbot
</span> PRBOT_CURRENT=$GOPATH/bin/prbot-current
PRBOT_NEXT=$GOPATH/bin/prbot-next
# Set up GOPATH, fetch or update source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-mkdir -p "$GOPATH/src/github.com/macports"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mkdir -p "$GOPATH"
</span> if [ -d "$MPBOT_GITHUB_SRC" ]; then
git -C "$MPBOT_GITHUB_SRC" fetch --quiet || true # Ignore network problems assuming they are temporary
git -C "$MPBOT_GITHUB_SRC" reset --quiet --hard origin/master
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git clone --quiet "https://$MPBOT_PACKAGE_NAME" "$MPBOT_GITHUB_SRC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git clone --quiet "$MPBOT_GITHUB_URL" "$MPBOT_GITHUB_SRC"
</span> fi
# Find out whether there are new changes to be deployed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +61,9 @@ if [ "$HEADREV" = "$CURRENTREV" ]; then
</span> fi
# Get dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>-"$GO" get -u "$MPBOT_PACKAGE_NAME/pr/prbot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cd "$MPBOT_GITHUB_SRC/$MPBOT_GITHUB_SUBFOLDER" && "$GO" get)
</span> # Install
<span style='display:block; white-space:pre;background:#ffe0e0;'>-"$GO" install "$MPBOT_PACKAGE_NAME/pr/prbot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cd "$MPBOT_GITHUB_SRC/$MPBOT_GITHUB_SUBFOLDER" && "$GO" install)
</span>
# Update symlink
mv "$GOPATH/bin/prbot" "$GOPATH/bin/prbot-$HEADREV"
</pre><pre style='margin:0'>
</pre>