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 <[email protected]>
  • Loading branch information
falkTX committed Dec 23, 2023
1 parent 4abf7b5 commit 67512d9
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion .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 Down Expand Up @@ -143,8 +155,12 @@ case "${1}" in
;;
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 67512d9

Please sign in to comment.