From 0cb12113e22933e37603fcb9c7cddcdc4d330e67 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Mon, 22 Jun 2020 19:55:37 +0100
Subject: [PATCH] [CI] Refactor Qt version

---
 .github/workflows/build.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31aaa4a7e..bdc291190 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,6 +11,7 @@ env:
   do_symbols:    ${{ startsWith(github.ref, 'refs/heads/develop/') }}
   do_vatsim_key: ${{ github.event_name == 'push' }}
   eol_months:    12
+  qt_version:    5.15.0
 
 jobs:
 
@@ -68,7 +69,7 @@ jobs:
     env:
       BACKTRACE_TOKEN: ${{ secrets.BACKTRACE_TOKEN }}
       BITROCK_BUILDER: ~/installbuilder/bin/builder
-      QDOC_PATH: $(GITHUB_WORKSPACE)/../Qt/Docs/Qt-5.15.0
+      QDOC_PATH: $(GITHUB_WORKSPACE)/../Qt/Docs/Qt-$(qt_version)
     outputs:
       warnings: ${{ steps.warnings.outputs.warnings }}
 
@@ -76,7 +77,7 @@ jobs:
       - name: Install Qt
         uses: swift-project/install-qt-action@swift
         with:
-          version: 5.15.0
+          version: ${{ env.qt_version }}
           aqtversion: ==0.9.2
           doc: true
       - name: Download InstallBuilder
@@ -145,13 +146,13 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.15.0
+          version: ${{ env.qt_version }}
           arch: win64_msvc2019_64
           aqtversion: ==0.9.2
       - name: Install Qt debug info
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.15.0
+          version: ${{ env.qt_version }}
           arch: win64_msvc2019_64
           aqtversion: ==0.9.2
           modules: debug_info
@@ -222,13 +223,13 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.15.0
+          version: ${{ env.qt_version }}
           arch: win32_msvc2019
           aqtversion: ==0.9.2
       - name: Install Qt debug info
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.15.0
+          version: ${{ env.qt_version }}
           arch: win32_msvc2019
           aqtversion: ==0.9.2
           modules: debug_info
@@ -299,7 +300,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          version: 5.15.0
+          version: ${{ env.qt_version }}
           aqtversion: ==0.9.2
       - name: Download InstallBuilder
         run: |