diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml index 1b5728bb..80a1df78 100644 --- a/.github/workflows/build-check.yaml +++ b/.github/workflows/build-check.yaml @@ -13,6 +13,13 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +env: + QT_VERSION: "6.10.2" + QT_MODULES: >- + qtpositioning + qtwebchannel + qtwebengine + jobs: build-ubuntu: name: ${{ matrix.config.name }} @@ -78,41 +85,21 @@ jobs: config: - name: Windows Server 2022 os: windows-2022 - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release buildPreset: release publishArtifacts: true - name: Windows Server 2022 Portable os: windows-2022 - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release-portable buildPreset: release-portable publishArtifacts: true - name: Windows 11 ARM64 os: windows-11-arm - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release buildPreset: release publishArtifacts: true - name: Windows 11 ARM64 Portable os: windows-11-arm - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release-portable buildPreset: release-portable publishArtifacts: true @@ -153,8 +140,8 @@ jobs: - name: Install Qt uses: trollixx/setup-qt@v1 with: - version: ${{ matrix.config.qt_version }} - modules: ${{ matrix.config.qt_modules }} + version: ${{ env.QT_VERSION }} + modules: ${{ env.QT_MODULES }} - name: Configure & Build uses: lukka/run-cmake@v10 @@ -203,11 +190,6 @@ jobs: config: - name: macOS 15 ARM64 os: macos-15 - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release buildPreset: release @@ -223,8 +205,8 @@ jobs: - name: Install Qt uses: trollixx/setup-qt@v1 with: - version: ${{ matrix.config.qt_version }} - modules: ${{ matrix.config.qt_modules }} + version: ${{ env.QT_VERSION }} + modules: ${{ env.QT_MODULES }} - name: Configure & Build uses: lukka/run-cmake@v10 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 28e1ef5e..73967340 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,6 +11,13 @@ concurrency: group: ${{ github.workflow }} cancel-in-progress: false +env: + QT_VERSION: "6.10.2" + QT_MODULES: >- + qtpositioning + qtwebchannel + qtwebengine + jobs: build-windows: name: ${{ matrix.config.name }} @@ -27,41 +34,21 @@ jobs: config: - name: Windows Server 2022 os: windows-2022 - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release buildPreset: release uploadPattern: "zeal-*-windows-x64.msi" - name: Windows Server 2022 / Portable os: windows-2022 - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release-portable buildPreset: release-portable uploadPattern: "zeal-*-portable-windows-x64.*" - name: Windows 11 ARM64 os: windows-11-arm - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release buildPreset: release uploadPattern: "zeal-*-windows-arm64.msi" - name: Windows 11 ARM64 / Portable os: windows-11-arm - qt_modules: >- - qtpositioning - qtwebchannel - qtwebengine - qt_version: "6.10.2" configurePreset: release-portable buildPreset: release-portable uploadPattern: "zeal-*-portable-windows-arm64.*" @@ -80,8 +67,8 @@ jobs: - name: Install Qt uses: trollixx/setup-qt@v1 with: - version: ${{ matrix.config.qt_version }} - modules: ${{ matrix.config.qt_modules }} + version: ${{ env.QT_VERSION }} + modules: ${{ env.QT_MODULES }} - name: Configure & Build uses: lukka/run-cmake@v10