Merge pull request #3565 from mozilla/fix-dependencies-ci; r=mhammond

Run CI dependency checks on a Mac, to properly detect iOS-specific dependencies

.circleci/config.yml

@@ -303,10 +303,11 @@ jobs:
           name: Lint Bash scripts with shellcheck
           command: sh automation/lint_bash_scripts.sh
   Check Rust dependencies:
-    docker:
-      - image: circleci/rust:latest
+    # This check has to be done on a mac, to be able to detect iOS-specific dependencies.
+    macos:
+      xcode: "11.7.0"
     steps:
-      - run: sudo apt-get install python3-pip
+      - install-rust
       - setup-rust-toolchain
       - checkout
       - dependency-checks

tools/dependency_summary.py

@@ -17,6 +17,7 @@
 import hashlib
 import json
 import textwrap
+import difflib
 import itertools
 import collections
 from urllib.parse import urlparse, urlunparse
@@ -1086,7 +1087,13 @@ def pf(string, *args):
         print_dependency_summary_markdown(deps, file=output)
 
     if args.check:
+        output.seek(0)
+        outlines = output.readlines()
         with open(args.check, 'r') as f:
-            if f.read() != output.getvalue():
+            checklines = f.readlines()
+            if outlines != checklines:
                 raise RuntimeError(
-                    "Dependency details have changed from those in {}".format(args.check))
+                    "Dependency details have changed from those in {}:\n{}".format(
+                        args.check,
+                        "".join(difflib.unified_diff(checklines, outlines))
+                    ))