diff --git a/.github/workflows/build-full-pri.yml b/.github/workflows/build-full-pri.yml index 113b3be..4b8d1bc 100644 --- a/.github/workflows/build-full-pri.yml +++ b/.github/workflows/build-full-pri.yml @@ -13,25 +13,22 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - qt_arch: - - gcc_64 # For Ubuntu (Linux) - - win64_msvc2019_64 # For Windows steps: - uses: actions/checkout@v3 - # Install Qt based on the OS and architecture from the matrix - - name: Install Qt - uses: jurplel/install-qt-action@v3 + # Install Qt and set the appropriate architecture based on the OS + - uses: jurplel/install-qt-action@v3 with: - arch: ${{ matrix.qt_arch }} + # Conditional selection of architecture based on OS + arch: ${{ matrix.os == 'ubuntu-latest' && 'gcc_64' || 'win64_msvc2019_64' }} + # Same Qt modules for both OS archives: 'icu qtbase qtmultimedia qtgamepad qtsystems qtlocation qtsensors' - # Build the project using qmake and make for both platforms + # Build step - name: Build run: | - qmake - if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then - make + if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then + qmake && make else - nmake + qmake && nmake