From e1f20063c510ccb84614fbe36d1a93c4fd0e65bf Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 21 Nov 2024 22:31:51 +0500 Subject: [PATCH 1/2] workflows: fully drop 32-bit Windows MSYS2 builds With CLANG32 on its way out and qt5-static for MINGW32 being dropped, there's no point in keeping them --- .github/workflows/cmake_windows_msys2.yml | 6 ------ .github/workflows/codeql_windows_msys2.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml index 91442eafd..7620351b3 100644 --- a/.github/workflows/cmake_windows_msys2.yml +++ b/.github/workflows/cmake_windows_msys2.yml @@ -67,15 +67,9 @@ jobs: environment: # - msystem: MSYS # toolchain: ./cmake/flags-gcc-x86_64.cmake -# - msystem: MINGW32 -# prefix: mingw-w64-i686 -# toolchain: ./cmake/flags-gcc-i686.cmake - msystem: MINGW64 prefix: mingw-w64-x86_64 toolchain: ./cmake/flags-gcc-x86_64.cmake -# - msystem: CLANG32 -# prefix: mingw-w64-clang-i686 -# toolchain: ./cmake/llvm-win32-i686.cmake # - msystem: CLANG64 # prefix: mingw-w64-clang-x86_64 # toolchain: ./cmake/llvm-win32-x86_64.cmake diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml index 652a1986a..67de8ec8b 100644 --- a/.github/workflows/codeql_windows_msys2.yml +++ b/.github/workflows/codeql_windows_msys2.yml @@ -72,15 +72,9 @@ jobs: environment: # - msystem: MSYS # toolchain: ./cmake/flags-gcc-x86_64.cmake - - msystem: MINGW32 - prefix: mingw-w64-i686 - toolchain: ./cmake/flags-gcc-i686.cmake - msystem: MINGW64 prefix: mingw-w64-x86_64 toolchain: ./cmake/flags-gcc-x86_64.cmake -# - msystem: CLANG32 -# prefix: mingw-w64-clang-i686 -# toolchain: ./cmake/llvm-win32-i686.cmake # - msystem: CLANG64 # prefix: mingw-w64-clang-x86_64 # toolchain: ./cmake/llvm-win32-x86_64.cmake From e2beb3eed1c96d629006b27e7565085eb15fffa5 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 21 Nov 2024 22:40:47 +0500 Subject: [PATCH 2/2] workflows: build with VDE support on macOS and Linux --- .github/workflows/cmake_linux.yml | 1 + .github/workflows/cmake_macos.yml | 1 + .github/workflows/codeql_linux.yml | 1 + .github/workflows/codeql_macos.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml index 859a38899..a8945172b 100644 --- a/.github/workflows/cmake_linux.yml +++ b/.github/workflows/cmake_linux.yml @@ -81,6 +81,7 @@ jobs: libopenal-dev libslirp-dev libfluidsynth-dev + libvdeplug-dev ${{ matrix.ui.packages }} - name: Checkout repository diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml index f482c7b69..d02ec595b 100644 --- a/.github/workflows/cmake_macos.yml +++ b/.github/workflows/cmake_macos.yml @@ -81,6 +81,7 @@ jobs: openal-soft fluidsynth libslirp + vde ${{ matrix.ui.packages }} - name: Checkout repository diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml index 396ccd4fe..412a2045c 100644 --- a/.github/workflows/codeql_linux.yml +++ b/.github/workflows/codeql_linux.yml @@ -84,6 +84,7 @@ jobs: libopenal-dev libslirp-dev libfluidsynth-dev + libvdeplug-dev ${{ matrix.ui.packages }} - name: Checkout repository diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml index 6947ab6ef..5ce12548b 100644 --- a/.github/workflows/codeql_macos.yml +++ b/.github/workflows/codeql_macos.yml @@ -75,6 +75,7 @@ jobs: openal-soft fluidsynth libslirp + vde ${{ matrix.ui.packages }} - name: Checkout repository