From 177b2d0c19e4127229488ad43d57aba459c719ed Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Thu, 25 Jun 2020 17:58:55 +0100
Subject: [PATCH] Move flake8 to end. Don't exit script on failure (#7738)

---
 changelog.d/7738.misc | 1 +
 scripts-dev/lint.sh   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/7738.misc

diff --git a/changelog.d/7738.misc b/changelog.d/7738.misc
new file mode 100644
index 000000000..424ac15d6
--- /dev/null
+++ b/changelog.d/7738.misc
@@ -0,0 +1 @@
+Move `flake8` to the end of `scripts-dev/lint.sh` as it takes the longest and could cause the script to exit early.
diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh
index 34c4854e1..6f1ba2293 100755
--- a/scripts-dev/lint.sh
+++ b/scripts-dev/lint.sh
@@ -2,8 +2,8 @@
 #
 # Runs linting scripts over the local Synapse checkout
 # isort - sorts import statements
-# flake8 - lints and finds mistakes
 # black - opinionated code formatter
+# flake8 - lints and finds mistakes
 
 set -e
 
@@ -16,6 +16,6 @@ fi
 
 echo "Linting these locations: $files"
 isort -y -rc $files
-flake8 $files
 python3 -m black $files
 ./scripts-dev/config-lint.sh
+flake8 $files