cirrus: add step to validate integrity of vendor

Signed-off-by: Aditya Rajan <[email protected]>

Author: flouthoc

.cirrus.yml

@@ -91,9 +91,6 @@ validate_task:
   # From this point forward, all cache's become read-only - meaning
   # any changes made in this task aren't re-uploaded to the cache.
   # This avoids some flapping between tasks, along with the upload time.
-  pkg_cache: &ro_pkg_cache # TODO: Remove when packages included in static VM images
-    <<: *pkg_cache
-    reupload_on_changes: false
   cargo_cache: &ro_cargo_cache
     <<: *cargo_cache
     reupload_on_changes: false
@@ -106,15 +103,20 @@ validate_task:
   setup_script: *setup
   main_script: *main
 
+verify_vendor_task:
+  alias: "verify_vendor"
+  depends_on:
+    - "build"
+  cargo_cache: *ro_cargo_cache
+  targets_cache: *ro_targets_cache
+  bin_cache: *ro_bin_cache
+  setup_script: *setup
+  main_script: *main
 
 unit_task:
   alias: "unit"
   depends_on:
     - "validate"
-  pkg_cache: *ro_pkg_cache # TODO: Remove when packages included in static VM images
-  cargo_cache: *ro_cargo_cache
-  targets_cache: *ro_targets_cache
-  bin_cache: *ro_bin_cache
   setup_script: *setup
   main_script: *main
 
@@ -159,6 +161,7 @@ success_task:
   depends_on:
     - "build"
     - "validate"
+    - "verify_vendor"
     - "unit"
     - "integration"
     - "meta"

contrib/cirrus/runner.sh

@@ -28,6 +28,13 @@ _run_validate() {
     make validate
 }
 
+_run_verify_vendor() {
+    # N/B: current repo. dir. contents produced by _run_build() above.
+    if ! git diff --no-ext-diff --quiet --exit-code; then
+        die "Found uncommited and necessary changes to vendoring, please fix, commit, and re-submit."
+    fi
+}
+
 _run_unit() {
     make unit
 }