From f1962e7d35f04ec3b2bc36cf9d9e91e8866ff02b Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Mon, 4 Jul 2022 13:25:43 -0600 Subject: [PATCH] update gui --- mupen64plus-gui/.github/workflows/build.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mupen64plus-gui/.github/workflows/build.yml b/mupen64plus-gui/.github/workflows/build.yml index 4a4edd9..28a7a47 100644 --- a/mupen64plus-gui/.github/workflows/build.yml +++ b/mupen64plus-gui/.github/workflows/build.yml @@ -1,28 +1,33 @@ name: Build project -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: jobs: build-linux: runs-on: ubuntu-20.04 - container: quay.io/centos/centos:stream9 + container: registry.fedoraproject.org/fedora:latest steps: - uses: actions/checkout@v3 - name: Checkout core repo uses: actions/checkout@v3 with: - repository: mupen64plus/mupen64plus-core + repository: loganmc10/mupen64plus-core path: mupen64plus-core + ref: m64p - name: Update and install packages run: | dnf -y update - dnf -y install qt5-qtwebsockets-devel SDL2-devel zlib-devel + dnf -y install qt6-qtwebsockets-devel SDL2-devel zlib-devel - name: Run build script run: | echo "#define GUI_VERSION \"a12345\"" > version.h mkdir build cd build - qmake-qt5 .. + qmake .. make build-windows: runs-on: windows-2022 @@ -39,12 +44,12 @@ jobs: install: >- make mingw-w64-x86_64-SDL2 - mingw-w64-x86_64-qt5 + mingw-w64-x86_64-qt6 mingw-w64-x86_64-gcc - name: Run build script run: | echo '#define GUI_VERSION "a12345"' > version.h mkdir build cd build - msys2 -c 'qmake ..' + msys2 -c 'qmake-qt6 ..' msys2 -c 'make'