From 9f8bada8763fe4843cc7934979e93a646004580f Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 3 Jan 2023 23:38:02 -0500 Subject: [PATCH 1/5] Use pacboy in mingw makefile builds too --- .github/workflows/c-cpp.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 8899d9943..282bfc602 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -62,15 +62,16 @@ jobs: msystem: ${{ matrix.environment.msystem }} install: >- make - ${{ matrix.environment.prefix }}-gcc - ${{ matrix.environment.prefix }}-pkg-config - ${{ matrix.environment.prefix }}-freetype - ${{ matrix.environment.prefix }}-SDL2 - ${{ matrix.environment.prefix }}-zlib - ${{ matrix.environment.prefix }}-libpng - ${{ matrix.environment.prefix }}-openal - ${{ matrix.environment.prefix }}-rtmidi - ${{ matrix.environment.prefix }}-libvncserver + pacboy: >- + gcc:p + pkg-config:p + freetype:p + SDL2:p + zlib:p + libpng:p + openal:p + rtmidi:p + libvncserver:p - uses: actions/checkout@v3 - name: make run: >- From 7ac62e1ff87a21e0ffea824b417803f3b8ed44f2 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 3 Jan 2023 23:38:53 -0500 Subject: [PATCH 2/5] Preparations for alternate UI builds in GHA --- .github/workflows/cmake.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1c1a58e32..24edc4073 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -210,7 +210,7 @@ jobs: path: build/artifacts/** linux: - name: "Linux GCC 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)" + name: "Linux GCC 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)" runs-on: ubuntu-22.04 @@ -231,6 +231,13 @@ jobs: - name: NDR new: on slug: -NDR + ui: + - name: Qt GUI + qt: on + slug: -Qt + packages: >- + qtbase5-dev + qttools5-dev steps: - name: Install dependencies @@ -243,10 +250,9 @@ jobs: libpng-dev libc6-dev librtmidi-dev - qtbase5-dev - qttools5-dev libopenal-dev libvncserver-dev + ${{ matrix.ui.packages }} - uses: actions/checkout@v3 - name: Configure CMake run: >- @@ -260,11 +266,11 @@ jobs: run: cmake --install build - uses: actions/upload-artifact@v3 with: - name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}' + name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}' path: build/artifacts/** macos11: - name: "macOS 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)" + name: "macOS 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)" runs-on: macos-11 @@ -285,6 +291,12 @@ jobs: - name: NDR new: on slug: -NDR + ui: + - name: Qt GUI + qt: on + slug: -Qt + packages: >- + qt@5 steps: - name: Install dependencies @@ -295,9 +307,9 @@ jobs: sdl2 libpng rtmidi - qt@5 openal-soft libvncserver + ${{ matrix.ui.packages }} - uses: actions/checkout@v3 - name: Configure CMake run: >- @@ -314,5 +326,5 @@ jobs: run: cmake --install build - uses: actions/upload-artifact@v3 with: - name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' + name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' path: build/artifacts/** From 0966e4bab0865209bea00acea335825dc60a43f0 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 3 Jan 2023 23:39:09 -0500 Subject: [PATCH 3/5] Use pkgconf, not pkg-config, fixes a warning --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 24edc4073..e8fca5dd3 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -82,7 +82,7 @@ jobs: ninja:p cmake:p gcc:p - pkg-config:p + pkgconf:p freetype:p SDL2:p zlib:p From 62817b55c99511e9d44dc0dfb7a263cd0896c6db Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 3 Jan 2023 23:39:30 -0500 Subject: [PATCH 4/5] release: false should speed up the msys2 builds a little --- .github/workflows/c-cpp.yml | 1 + .github/workflows/cmake.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 282bfc602..5b2573dde 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -58,6 +58,7 @@ jobs: - name: Prepare MSYS2 environment uses: msys2/setup-msys2@v2 with: + release: false update: true msystem: ${{ matrix.environment.msystem }} install: >- diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e8fca5dd3..58f537d21 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -76,6 +76,7 @@ jobs: - name: Prepare MSYS2 environment uses: msys2/setup-msys2@v2 with: + release: false update: true msystem: ${{ matrix.environment.msystem }} pacboy: >- From d6b118a4fc89a6c5aa8be351dae0db8527f85335 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Wed, 4 Jan 2023 00:26:07 -0500 Subject: [PATCH 5/5] Fix another warning --- src/discord.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/discord.c b/src/discord.c index 55f6d1544..458688eaa 100644 --- a/src/discord.c +++ b/src/discord.c @@ -88,7 +88,7 @@ discord_update_activity(int paused) *(paren - 1) = '\0'; #pragma GCC diagnostic push -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined (__clang__) # pragma GCC diagnostic ignored "-Wformat-truncation" #endif if (strlen(vm_name) < 100) {