Switch mingw64 to Ubuntu 24.04

tresf · Feb 3, 2025 · 0ad0edd · 0ad0edd
1 parent 10bdf12
commit 0ad0edd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -231,7 +231,6 @@ jobs:
   mingw:
     name: mingw64
     runs-on: ubuntu-latest
-    container: ghcr.io/lmms/linux.mingw:20.04
     env:
       CMAKE_OPTS: >-
         -Werror=dev
@@ -242,12 +241,12 @@ jobs:
       CCACHE_NOCOMPRESS: 1
       MAKEFLAGS: -j2
     steps:
-      - name: Enable POSIX MinGW
+      - name: Configure apt
         run: |
-          update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
-          update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
-          update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
-          update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+          sudo add-apt-repository ppa:tobydox/mingw-w64
+          sudo sed -i -e "s/$(lsb_release -cs)/focal/g" \
+          /etc/apt/sources.list.d/tobydox-ubuntu-mingw-w64-$(lsb_release -cs).sources
+          sudo apt-get update -y
       - name: Configure git
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Check out
@@ -264,6 +263,10 @@ jobs:
             ccache-${{ github.job }}-64-${{ github.ref }}-
             ccache-${{ github.job }}-64-
           path: ~/.ccache
+      - name: Install dependencies
+        run: |
+          sudo apt-get install -y --no-install-recommends \
+          $(xargs < .github/workflows/deps-ubuntu-24.04-mingw.txt)
       - name: Configure
         run: |
           ccache --zero-stats

diff --git a/.github/workflows/deps-ubuntu-24.04-mingw.txt b/.github/workflows/deps-ubuntu-24.04-mingw.txt
@@ -0,0 +1,31 @@
+binutils-mingw-w64
+cmake
+fftw-mingw-w64
+file
+flac-mingw-w64
+fltk-mingw-w64
+fluidsynth-mingw-w64
+g++-mingw-w64-i686
+g++-mingw-w64-x86-64
+gcc-mingw-w64
+gcc-mingw-w64-i686
+gcc-mingw-w64-x86-64
+git
+glib2-mingw-w64
+lame-mingw-w64
+libgig-mingw-w64
+liblist-moreutils-perl
+libsamplerate-mingw-w64
+libsndfile-mingw-w64
+libsoundio-mingw-w64
+libvorbis-mingw-w64
+libxml-parser-perl
+libz-mingw-w64-dev
+mingw-w64-tools
+nsis
+portaudio-mingw-w64
+qt5base-mingw-w64
+qt5svg-mingw-w64
+qttools5-dev-tools
+sdl2-mingw-w64
+stk-mingw-w64