EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233594
Change subject: Add documentation and Makefile command for submodule updates
......................................................................
Add documentation and Makefile command for submodule updates
Change-Id: I5fb7c3afd6bca7f092535fc58cc9350bda516695
---
M Makefile
M README
M setup.sh
3 files changed, 21 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard
refs/changes/94/233594/1
diff --git a/Makefile b/Makefile
index bdc9ea4..e4cc97e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,10 @@
+bump_metrics_submodule:
+ cd shiny-server/metrics
+ git pull --ff-only
+ git commit -m 'Bump metrics dashboard submodule' shiny-server/metrics
+ git review
+
update:
git pull --ff-only
git submodule update --init --recursive
diff --git a/README b/README
index f1f9aa1..388184f 100644
--- a/README
+++ b/README
@@ -1,5 +1,19 @@
-==
+== Updating the dashboards in this repository
+This repository contains only the code that wraps around and
+provisions the dashboards, not the dashboard itself. The dashboards
+are kept as git submodules. To update this repository to point
+at the latest master branch of the metrics dashboard issue the
+following:
+
+$ cd shiny-server/metrics
+$ git pull --ff-only
+$ cd -
+$ git commit -m 'Bump dashboard submodule' shiny-server/metrics
+$ git review
+
+This will create a commit named 'Bump dashboard submodule' and
+push it to gerrit for review.
==Running in labs
diff --git a/setup.sh b/setup.sh
index cca9899..df8dae9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -134,9 +134,6 @@
$PROJECT_ROOT/files/etc_init.d_shiny-server \
/etc/init.d/shiny-server
chmod +x /etc/init.d/shiny-server
- if which systemctl > /dev/null; then
- systemctl daemon-reload
- fi
fi
if [ "$RESTART_SHINY" -eq 1 ]; then
--
To view, visit https://gerrit.wikimedia.org/r/233594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fb7c3afd6bca7f092535fc58cc9350bda516695
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
