diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b94017245..9fcdd7c32 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,59 +15,7 @@ on: jobs: # Build job for Ubuntu - build-ubuntu: - strategy: - fail-fast: false - matrix: - include: - - name: Ubuntu 22-04 GCC QT5 - image: ubuntu-22.04 - cc: gcc - cxx: g++ - build-type: Debug - experimental: false - qt-packages: "qttools5-dev qttools5-dev-tools" - - name: Ubuntu 22-04 GCC QT6 - image: ubuntu-22.04 - cc: gcc - cxx: g++ - build-type: Debug - experimental: false - qt-packages: "qt6-base-dev qt6-tools-dev qt6-tools-dev-tools libqt6core5compat6-dev qt6-l10n-tools linguist-qt6" - - name: Ubuntu 22-04 Clang QT5 - image: ubuntu-22.04 - cc: clang - cxx: clang++ - build-type: Debug - experimental: true - qt-packages: "qttools5-dev qttools5-dev-tools" - - name: Ubuntu 20-04 GCC (for AppImage comp) - image: ubuntu-20.04 - cc: gcc - cxx: g++ - build-type: Debug - experimental: false - qt-packages: "qttools5-dev qttools5-dev-tools" - - name: ${{ matrix.name }} ${{ matrix.build-type }} - runs-on: ${{ matrix.image }} - continue-on-error: ${{ matrix.experimental }} - - steps: - - uses: actions/checkout@v3 - - - name: Install Dependencies - run: sudo apt-get update && sudo apt-get install extra-cmake-modules libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build ${{ matrix.qt-packages }} - - - name: Configure CMake - run: cmake -GNinja -DCHECK_FOR_UPDATES=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B ${{ github.workspace }}/build - env: - CXX: ${{ matrix.cxx }} - CC: ${{ matrix.cc }} - - - name: Build AntiMicroX - run: cmake --build ${{ github.workspace }}/build - + # Build job for Windows build-windows: strategy: @@ -125,8 +73,9 @@ jobs: - name: Install Qt run: | curl -L -o qt-installer.exe https://ftp.icm.edu.pl/packages/qt/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.0.exe - qt-installer.exe --help - qt-installer.exe --verbose --root D:/a/antimicrox/antimicrox/qt/Qt --accept-licenses --default-answer --confirm-command install qt.qt6.670.mingw_64 + ls + ./qt-installer.exe --help + ./qt-installer.exe --verbose --root D:/a/antimicrox/antimicrox/qt/Qt --accept-licenses --default-answer --confirm-command install qt.qt6.670.mingw_64 - name: Configure CMake run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B "${{ github.workspace }}/build" ${{ matrix.cmake-args }}