summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-04 06:43:05 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-04 06:43:05 +0200
commit56c433b914d65ccf9b9c53a78562452475353e8d (patch)
tree5de90ea40c59edc7888481ce0d52276b1ed592a7
parenta1bf520e2836968d1df4d066d4ace448f93da8a4 (diff)
Update staging script with bbot packages
-rwxr-xr-xstage12
1 files changed, 9 insertions, 3 deletions
diff --git a/stage b/stage
index a9eb44a..dd0ac82 100755
--- a/stage
+++ b/stage
@@ -155,6 +155,9 @@ dist libbpkg build2
dist bpkg build2
dist brep build2
+dist libbbot build2
+dist bbot build2
+
# Regenerate the repository.
#
info "Insert $repo_name signing key and press Enter"
@@ -166,11 +169,14 @@ etc/rep-update "$repo_dir/" \
# Sync repository and distribution.
#
+# Note that we do the distribution first so that the toolchain changes are
+# visible before package changes. This is relied upon by the Build OS monitor.
+#
+rsync -v -rlpt -c --copy-unsafe-links --prune-empty-dirs --delete-after \
+ $rsync_ops staging/0/ stage.build2.org:/var/www/stage.build2.org/public/0/
+
etc/rep-publish "$repo_dir/" "$repo_host1/" $rsync_ops
if [ -n "$repo_host2" ]; then
etc/rep-publish "$repo_dir/" "$repo_host2/" $rsync_ops
fi
-
-rsync -v -rlpt -c --copy-unsafe-links --prune-empty-dirs --delete-after \
- $rsync_ops staging/0/ stage.build2.org:/var/www/stage.build2.org/public/0/