From 5ad6a1a71ac4e558a6e2cfc866350cda69af59db Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 23 Dec 2023 19:16:09 +0100 Subject: [PATCH] Dont go quiet for main compiler install Signed-off-by: falkTX --- .github/workflows/bootstrap-deps.sh | 54 +++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh index 2732780..fbd4399 100755 --- a/.github/workflows/bootstrap-deps.sh +++ b/.github/workflows/bootstrap-deps.sh @@ -21,12 +21,15 @@ function install_compiler() { local arch="${1}" local release="${2}" - apt-get install -yqq g++ + echo "pawpaw debug 1" + apt-get install -yqq gcc g++ + echo "pawpaw debug 2" if [ -n "${GITHUB_ENV}" ] && [ "${release}" = "bionic" ]; then apt-get install -yqq g++-11 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 60 --slave /usr/bin/g++ g++ /usr/bin/g++-11 fi + echo "pawpaw debug 3" case "${arch}" in "linux-aarch64") @@ -56,10 +59,17 @@ function install_compiler() { fi ;; "linux-x86_64") + echo "pawpaw debug 4" if [ "$(uname -m)" != "x86_64" ]; then + echo "pawpaw debug 5a" apt-get install -yqq g++-x86_64-linux-gnu + echo "pawpaw debug 6a" elif [ -n "${GITHUB_ENV}" ] && [ "${release}" = "bionic" ]; then + echo "pawpaw debug 5b" update-alternatives --install /usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/gcc-11 60 --slave /usr/bin/x86_64-linux-gnu-g++ x86_64-linux-gnu-g++ /usr/bin/g++-11 + echo "pawpaw debug 6b" + else + echo "pawpaw debug 5c" fi ;; "win32") @@ -69,6 +79,8 @@ function install_compiler() { apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 ;; esac + + echo "pawpaw debug 7" } case "${1}" in @@ -82,48 +94,76 @@ case "${1}" in exec /usr/bin/sudo $0 "$@" fi + echo "pawpaw debug 01" apt-get update -qq apt-get install -yqq autoconf automake build-essential curl cmake file git jq libglib2.0-dev-bin libtool lsb-release make meson gperf patchelf pkg-config uuid-dev zlib1g-dev + echo "pawpaw debug 02" linux_arch=$(get_linux_deb_arch "${1}") release=$(lsb_release -cs 2>/dev/null) + echo "pawpaw debug 03" if [ -n "${linux_arch}" ]; then + echo "pawpaw debug 04" if [ "$(lsb_release -si 2>/dev/null)" = "Ubuntu" ]; then + echo "pawpaw debug 05" sed -i "s/deb http/deb [arch=i386,amd64] http/" /etc/apt/sources.list sed -i "s/deb mirror/deb [arch=i386,amd64] mirror/" /etc/apt/sources.list + echo "pawpaw debug 06" if [ "${linux_arch}" != "amd64" ] && [ "${linux_arch}" != "i386" ]; then + echo "pawpaw debug 07" echo "deb [arch=${linux_arch}] http://ports.ubuntu.com/ubuntu-ports ${release} main restricted universe multiverse" | tee -a /etc/apt/sources.list echo "deb [arch=${linux_arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list echo "deb [arch=${linux_arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list fi if [ -n "${GITHUB_ENV}" ] && [ "${release}" = "bionic" ]; then + echo "pawpaw debug 08" apt-get install -yqq --no-install-recommends software-properties-common add-apt-repository -yn ppa:ubuntu-toolchain-r/test fi fi + echo "pawpaw debug 09" dpkg --add-architecture ${linux_arch} + echo "pawpaw debug a1" apt-get update -qq - apt-get install -yqq \ + echo "pawpaw debug a2" + apt-get install -y \ binfmt-support \ qemu-user-static \ qtbase5-dev-tools \ libasound2-dev:${linux_arch} \ + libasound2-dev/${release} \ libdbus-1-dev:${linux_arch} \ + libdbus-1-dev/${release} \ libgl1-mesa-dev:${linux_arch} \ + libgl1-mesa-dev/${release} \ libglib2.0-dev:${linux_arch} \ + libglib2.0-dev/${release} \ libpcre2-dev:${linux_arch} \ + libpcre2-dev/${release} \ libpcre3-dev:${linux_arch} \ + libpcre3-dev/${release} \ libqt5svg5-dev:${linux_arch} \ + libqt5svg5-dev/${release} \ libx11-dev:${linux_arch} \ + libx11-dev/${release} \ libxcb1-dev:${linux_arch} \ + libxcb1-dev/${release} \ libxcursor-dev:${linux_arch} \ + libxcursor-dev/${release} \ libxext-dev:${linux_arch} \ + libxext-dev/${release} \ libxfixes-dev:${linux_arch} \ + libxfixes-dev/${release} \ libxrandr-dev:${linux_arch} \ + libxrandr-dev/${release} \ libxrender-dev:${linux_arch} \ + libxrender-dev/${release} \ qtbase5-dev:${linux_arch} \ - uuid-dev:${linux_arch} + qtbase5-dev/${release} \ + uuid-dev:${linux_arch} \ + uuid-dev/${release} + echo "pawpaw debug a3" elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then dpkg --add-architecture i386 apt-get update -qq @@ -137,14 +177,22 @@ case "${1}" in case "${release}" in "bionic"|"bullseye"|"focal") + echo "pawpaw debug b1" apt-get install -yqq --no-install-recommends python3-pip + echo "pawpaw debug b2" pip3 install --isolated --upgrade --no-cache-dir --force-reinstall pip + echo "pawpaw debug b3" pip3 install --isolated --upgrade --no-cache-dir --force-reinstall cmake meson + echo "pawpaw debug b4" ;; esac + echo "pawpaw debug 11" install_compiler "${1}" "${release}" + echo "pawpaw debug 12" [ -n "${GITHUB_ENV}" ] && echo "PAWPAW_PACK_NAME=${1}-${release}" >> "${GITHUB_ENV}" + + echo "pawpaw debug 14" ;; esac