diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml index be4494e8..80dc567d 100644 --- a/.github/workflows/build-appimage.yml +++ b/.github/workflows/build-appimage.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 @@ -19,12 +19,12 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list sudo apt update - sudo apt install cmake extra-cmake-modules libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev libqt5multimedia5-plugins qt5-default qtbase5-private-dev qtmultimedia5-dev libslirp0 libslirp-dev libarchive-dev zstd libzstd-dev --allow-downgrades + sudo apt install cmake extra-cmake-modules libpcap0.8-dev libsdl2-dev libqt6multimedia6-plugins qt6-default qtbase6-private-dev qtmultimedia6-dev libslirp0 libslirp-dev libarchive-dev libzstd-dev --allow-downgrades - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure working-directory: ${{runner.workspace}}/build - run: cmake $GITHUB_WORKSPACE + run: cmake $GITHUB_WORKSPACE -DUSE_QT6=ON - name: Make working-directory: ${{runner.workspace}}/build run: | diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 43f4d8b6..578ec4bd 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -14,8 +14,8 @@ env: jobs: build: name: aarch64 - runs-on: ubuntu-20.04 - container: ubuntu:20.04 + runs-on: ubuntu-latest + container: ubuntu:22.04 steps: - name: Prepare system @@ -34,7 +34,7 @@ jobs: rm /etc/apt/sources.list mv /etc/apt/sources.list{.new,} apt update - DEBIAN_FRONTEND=noninteractive apt install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu {libsdl2,qtbase5,qtbase5-private,qtmultimedia5,libslirp,libarchive,libzstd}-dev:arm64 zstd:arm64 cmake extra-cmake-modules dpkg-dev + DEBIAN_FRONTEND=noninteractive apt install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu {libsdl2,qtbase6,qtbase6-private,qtmultimedia6,libslirp,libarchive,libzstd}-dev:arm64 zstd:arm64 cmake extra-cmake-modules dpkg-dev - name: Configure shell: bash run: | diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 438fddd0..a68d9376 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -11,8 +11,7 @@ on: jobs: build: name: x86_64 - - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 @@ -20,12 +19,12 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list sudo apt update - sudo apt install cmake extra-cmake-modules libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default qtbase5-private-dev qtmultimedia5-dev libslirp0 libslirp-dev libarchive-dev zstd libzstd-dev --allow-downgrades + sudo apt install cmake extra-cmake-modules libpcap0.8-dev libsdl2-dev qtbase6-dev qtbase6-private-dev qtmultimedia6-dev libslirp0 libslirp-dev libarchive-dev libzstd-dev --allow-downgrades - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure working-directory: ${{runner.workspace}}/build - run: cmake $GITHUB_WORKSPACE + run: cmake $GITHUB_WORKSPACE -DUSE_QT6=ON - name: Make working-directory: ${{runner.workspace}}/build run: | diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index e6846da7..f180b832 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -23,15 +23,15 @@ jobs: - uses: actions/checkout@v1 - uses: msys2/setup-msys2@v2 with: - msystem: MINGW64 + msystem: UCRT64 update: true - name: Install dependencies - run: pacman -Sq --noconfirm git pkgconf mingw-w64-x86_64-{cmake,SDL2,qt5-static,libslirp,libarchive,toolchain} + run: pacman -Sq --noconfirm git pkgconf mingw-w64-ucrt-x86_64-{cmake,SDL2,qt6-static,libslirp,libarchive,toolchain} - name: Configure working-directory: ${{runner.workspace}} - run: cmake -B build $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH=C:/tools/msys64/mingw64/qt5-static + run: cmake -B build $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH=C:/tools/msys64/mingw64/qt6-static -DUSE_QT&=ON - name: Make working-directory: ${{runner.workspace}}/build