Merge pull request #2707 from input-output-hk/anviking/ruby-bors-stats

Add new improved ./scripts/bors-stats.rb
cardano-foundation · Jun 16, 2021 · 6007796 · 6007796
2 parents a080bd0 + 5e7e1b9
commit 6007796
Show file tree

Hide file tree

Showing 5 changed files with 654 additions and 150 deletions.
diff --git a/.envrc b/.envrc
@@ -1,22 +1,15 @@
 if [ -e .envrc-override ]; then
     # This env file will trump lorri, if present.
-    source .envrc-override
+    source_env .envrc-override
 elif type lorri &>/dev/null; then
     eval "$(lorri direnv)"
-
-    # Source a user-specific config in ./.envrc-local
-    if [ -e .envrc-local ]; then
-        source .envrc-local
-    fi
 else
     # Fall back to using direnv's builtin nix support
     # to prevent bootstrapping problems.
     # It's definitely better to use lorri, because direnv won't
     # be fast like this.
     use nix
-
-    # Source a user-specific config in ./.envrc-local
-    if [ -e .envrc-local ]; then
-        source .envrc-local
-    fi
 fi
+
+# Source a user-specific config in ./.envrc-local
+source_env_if_exists .envrc-local