update production

Changes from develop since 2022-08-01T11:46:43+00:00

Deployment Notes

Included Merge Requests

• !321 (merged)
• !324 (merged)
• !318 (merged)

Diff Stat

 .gitlab-ci.yml                    |  24 +++++-
 ci-tools/update-nixpkgs           |  14 ++--
 ci-tools/update-production        | 162 ++++++++++++++++++++++++++++++++++++++
 morph/grid/production/config.json |   4 +-
 nixos/pkgs/megacli2prom/repo.json |   4 +-
 5 files changed, 196 insertions(+), 12 deletions(-)

ci-tools/update-nixpkgs

@@ -54,8 +54,11 @@ main() {
     checkout_source_branch "$SSHKEY" "$SERVER_HOST" "$PROJECT_PATH" "$DEFAULT_BRANCH" "$SOURCE_BRANCH"
     build "result-before"
 
-    # If nothing changed, update_nixpkgs will just exit for us.
-    update_nixpkgs
+    # If nothing changed, report this and exit without an error.
+    if ! update_nixpkgs; then
+	echo "No changes."
+	exit 0
+    fi
 
     build "result-after"
     local DIFF=$(compute_diff "./result-before" "./result-after")
@@ -156,11 +159,10 @@ update_nixpkgs() {
     # file instead of the one that's part of its own checkout.
     nix-shell ../shell.nix --run 'update-nixpkgs ${PWD}/nixpkgs.json'
 
-    # Show us what we did - and signal a kind of error if we did nothing
-    # (expected in the case where nixpkgs hasn't changed since we last ran).
+    # Signal a kind of error if we did nothing (expected in the case where
+    # nixpkgs hasn't changed since we last ran).
     if git diff --exit-code; then
-	echo "No changes."
-	exit 0
+	return 1
     fi
 }