ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to use Qt 6 for CI builds

This commit is contained in:
Nadia Holmquist Pedersen 2024-01-28 17:15:18 +01:00
parent 7897bd387b
commit 829f5795ec
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-appimage.yml vendored
View File

@ -11,7 +11,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
@ -19,12 +19,12 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
sudo apt update 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 - name: Create build environment
run: mkdir ${{runner.workspace}}/build run: mkdir ${{runner.workspace}}/build
- name: Configure - name: Configure
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE run: cmake $GITHUB_WORKSPACE -DUSE_QT6=ON
- name: Make - name: Make
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |

6
.github/workflows/build-ubuntu-aarch64.yml vendored
View File

@ -14,8 +14,8 @@ env:
jobs: jobs:
build: build:
name: aarch64 name: aarch64
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
container: ubuntu:20.04 container: ubuntu:22.04
steps: steps:
- name: Prepare system - name: Prepare system
@ -34,7 +34,7 @@ jobs:
rm /etc/apt/sources.list rm /etc/apt/sources.list
mv /etc/apt/sources.list{.new,} mv /etc/apt/sources.list{.new,}
apt update 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 - name: Configure
shell: bash shell: bash
run: | run: |

7
.github/workflows/build-ubuntu.yml vendored
View File

@ -11,8 +11,7 @@ on:
jobs: jobs:
build: build:
name: x86_64 name: x86_64
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
@ -20,12 +19,12 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
sudo apt update 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 - name: Create build environment
run: mkdir ${{runner.workspace}}/build run: mkdir ${{runner.workspace}}/build
- name: Configure - name: Configure
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE run: cmake $GITHUB_WORKSPACE -DUSE_QT6=ON
- name: Make - name: Make
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |

6
.github/workflows/build-windows.yml vendored
View File

@ -23,15 +23,15 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: with:
msystem: MINGW64 msystem: UCRT64
update: true update: true
- name: Install dependencies - 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 - name: Configure
working-directory: ${{runner.workspace}} 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 - name: Make
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build