diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh index 2732780..4076d0b 100755 --- a/.github/workflows/bootstrap-deps.sh +++ b/.github/workflows/bootstrap-deps.sh @@ -104,17 +104,17 @@ case "${1}" in fi dpkg --add-architecture ${linux_arch} apt-get update -qq - apt-get install -yqq \ + apt-get install -yqq --allow-downgrades \ binfmt-support \ qemu-user-static \ - qtbase5-dev-tools \ + x11proto-dev x11proto-render-dev \ libasound2-dev:${linux_arch} \ libdbus-1-dev:${linux_arch} \ libgl1-mesa-dev:${linux_arch} \ libglib2.0-dev:${linux_arch} \ libpcre2-dev:${linux_arch} \ libpcre3-dev:${linux_arch} \ - libqt5svg5-dev:${linux_arch} \ + libvulkan-dev:${linux_arch} \ libx11-dev:${linux_arch} \ libxcb1-dev:${linux_arch} \ libxcursor-dev:${linux_arch} \ @@ -122,8 +122,11 @@ case "${1}" in libxfixes-dev:${linux_arch} \ libxrandr-dev:${linux_arch} \ libxrender-dev:${linux_arch} \ - qtbase5-dev:${linux_arch} \ uuid-dev:${linux_arch} + apt-get install -yqq --allow-downgrades \ + qtbase5-dev-tools \ + libqt5svg5-dev:${linux_arch} \ + qtbase5-dev:${linux_arch} elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then dpkg --add-architecture i386 apt-get update -qq @@ -148,3 +151,6 @@ case "${1}" in [ -n "${GITHUB_ENV}" ] && echo "PAWPAW_PACK_NAME=${1}-${release}" >> "${GITHUB_ENV}" ;; esac + +# if we reach this point in the script, make sure to return/exit 0 +exit 0