Skip to content

Commit

Permalink
Dont go quiet for main compiler install
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Dec 23, 2023
1 parent 4abf7b5 commit 668d6bf
Showing 1 changed file with 34 additions and 2 deletions.
36 changes: 34 additions & 2 deletions .github/workflows/bootstrap-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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
Expand All @@ -82,29 +94,40 @@ 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 \
Expand All @@ -124,6 +147,7 @@ case "${1}" in
libxrender-dev:${linux_arch} \
qtbase5-dev:${linux_arch} \
uuid-dev:${linux_arch}
echo "pawpaw debug a3"
elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then
dpkg --add-architecture i386
apt-get update -qq
Expand All @@ -137,14 +161,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

0 comments on commit 668d6bf

Please sign in to comment.