[CI] Refactor Qt version

This commit is contained in:
Mat Sutcliffe
2020-06-22 19:55:37 +01:00
parent c2a744a898
commit 0cb12113e2

View File

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