More CI fixes

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Dec 5, 2023 · f845177 · f845177
1 parent 55cf4be
commit f845177
Show file tree

Hide file tree

Showing 5 changed files with 402 additions and 493 deletions.
diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh
@@ -55,37 +55,23 @@ function install_compiler() {
             fi
         ;;
         "win32")
-            dpkg --add-architecture i386
-            apt-get update -qq
-            apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64
-            if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
-                apt-get install -yqq wine wine32
-            else
-                apt-get install -yqq wine-stable
-            fi
+            apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686
         ;;
         "win64")
-            dpkg --add-architecture i386
-            apt-get update -qq
-            apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64
-            if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
-                apt-get install -yqq wine wine32 wine64
-            else
-                apt-get install -yqq wine-stable
-            fi
+            apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
         ;;
     esac
 }
 
 case "${1}" in
     "macos"|"macos-universal"|"macos-universal-10.15")
-        brew install cmake git jq meson
+        brew install autoconf automake cmake coreutils gawk git gnu-sed jq make meson
 
         [ -n "${GITHUB_ENV}" ] && echo "PAWPAW_PACK_NAME=${1}-$(sw_vers -productVersion)" >> "${GITHUB_ENV}"
     ;;
     *)
         apt-get update -qq
-        apt-get install -yqq autoconf automake autopoint build-essential curl cmake dpkg-dev file git jq libtool lsb-release meson gperf patchelf
+        apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libglib2.0-dev-bin libtool lsb-release make meson gperf patchelf
 
         arch=$(get_linux_deb_arch "${1}")
         release=$(lsb_release -cs 2>/dev/null)
@@ -120,6 +106,15 @@ case "${1}" in
                 libxrandr-dev:${arch} \
                 libxrender-dev:${arch} \
                 uuid-dev:${arch}
+        elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then
+            dpkg --add-architecture i386
+            apt-get update -qq
+            apt-get install -yqq autopoint libreadline-dev mingw-w64 uuid-dev zlib1g-dev
+            if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
+                apt-get install -yqq wine wine32
+            else
+                apt-get install -yqq wine-stable
+            fi
         fi
         # libqt5svg5-dev qtbase5-dev qtbase5-dev-tools