Merge branch 'master' into ao-upgrade-ethereum-types

* master: [CI] allow cargo audit to fail (#10676)
openethereum · May 20, 2019 · 40240cb · 40240cb
2 parents ad28077 + 67e75e1
commit 40240cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -93,6 +93,7 @@ cargo-audit:
   <<:                              *docker-cache-status
   script:
     - cargo audit
+  allow_failure:                   true # failed cargo audit shouldn't prevent a PR from being merged
 
 validate-chainspecs:
   stage:                           test

diff --git a/Cargo.lock b/Cargo.lock