From b40451ab7594d5d9cc8d7c8b687257e8f82a61c9 Mon Sep 17 00:00:00 2001
From: Dain Nilsson <dain@yubico.com>
Date: Thu, 30 Nov 2023 11:25:20 +0100
Subject: [PATCH] Run flutter hooks sequentially.

---
 .github/workflows/linux.yml   | 12 ++++++------
 .github/workflows/windows.yml | 10 +++++-----
 .pre-commit-config.yaml       |  5 ++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0cd03277..a885337f 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -86,12 +86,6 @@ jobs:
         flutter config --enable-linux-desktop
         flutter --version
 
-    - name: Build the app
-      run: flutter build linux
-
-    - name: Check generated files
-      run: git diff --exit-code
-
     - name: Run lints/tests
       run: |
         export PATH=$PATH:$HOME/.local/bin  # Needed to ensure pip/pre-commit on PATH
@@ -99,6 +93,12 @@ jobs:
         pre-commit run --all-files
         flutter test
 
+    - name: Build the app
+      run: flutter build linux
+
+    - name: Check generated files
+      run: git diff --exit-code
+
     - name: Embedd appindicator
       run: |
         patchelf --set-rpath '$ORIGIN' build/linux/x64/release/bundle/lib/libtray_manager_plugin.so
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index eb071498..713da0ae 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -49,17 +49,17 @@ jobs:
       - run: flutter config --enable-windows-desktop
       - run: flutter --version
 
-      - name: Build the app
-        run: |
-          $version = python set-version.py | select-object -first 1
-          flutter build windows --build-name=$version
-
       - name: Run lints/tests
         run: |
           pip install pre-commit
           pre-commit run --all-files
           flutter test
 
+      - name: Build the app
+        run: |
+          $version = python set-version.py | select-object -first 1
+          flutter build windows --build-name=$version
+
       - name: Check generated files
         run: git diff -I '.*android.*flutter_plugins.*qrscanner_zxing' --exit-code
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dd373b9f..50799861 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,8 +3,11 @@ repos:
 - repo: https://github.com/dluksza/flutter-analyze-pre-commit
   rev: "4afcaa82fc368d40d486256bf4edba329bf667bb"
   hooks:
-    - id: flutter-analyze
     - id: dart-format
+      files: \.dart$
+      require_serial: true
+    - id: flutter-analyze
+      require_serial: true
 
 # Python
 - repo: https://github.com/PyCQA/flake8