From 40b522b42fc484a4b344dc2a9bc1c03e92ae1388 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Wed, 18 Aug 2021 23:29:19 -0500 Subject: [PATCH] GHActions:Linux: Remove unneccessary packages --- .../scripts/linux/install-packages.sh | 82 ++----------------- 1 file changed, 7 insertions(+), 75 deletions(-) diff --git a/.github/workflows/scripts/linux/install-packages.sh b/.github/workflows/scripts/linux/install-packages.sh index 5fd9c68d2d..ade206a431 100755 --- a/.github/workflows/scripts/linux/install-packages.sh +++ b/.github/workflows/scripts/linux/install-packages.sh @@ -6,100 +6,42 @@ set -e declare -a BUILD_PACKAGES=( "ccache" "cmake" - "g++-8-multilib" "ninja-build" ) -declare -a GCC_PACKAGES=( - # Nothing Unique Needed -) - -declare -a CLANG_PACKAGES=( - "clang-format" - "clang-tidy" - "clang-tools" - "clang" - "clangd-10" - "libc++-dev" - "libc++1" - "libc++abi-dev" - "libc++abi1" - "libclang-dev" - "libclang1" - "liblldb-10-dev" - "libllvm-10-ocaml-dev" - "libomp-dev" - "libomp5" - "lld" - "lldb" - "llvm-dev" - "llvm-runtime" - "llvm" - "python3-clang-10" -) - # Packages - PCSX2 declare -a PCSX2_PACKAGES=( - "curl" - "fuse" - "gettext" "libaio-dev" - "libasound2-dev" - "libatk1.0-dev" - "libatk-bridge2.0-dev" "libbz2-dev" - "libcairo2-dev" - "libcggl" - "libdbus-1-dev" "libegl1-mesa-dev" - "libfontconfig1-dev" "libgdk-pixbuf2.0-dev" - "libgirepository-1.0-1" - "libgl-dev" "libgl1-mesa-dev" - "libgl1-mesa-dri" - "libgl1" - "libgles2-mesa-dev" - "libglew-dev" - "libglib2.0-dev" - "libglu1-mesa-dev" - "libglu1-mesa" - "libglvnd-dev" - "libglx-mesa0" - "libglx0" "libgtk-3-dev" - "libgtk2.0-dev" "libharfbuzz-dev" - "libibus-1.0-dev" - "libjack-jackd2-dev" "libjpeg-dev" - "libllvm10" "liblzma-dev" - "liblzma5" - "libpango1.0-dev" "libpcap0.8-dev" "libpng-dev" - "libportaudiocpp0" "libpulse-dev" "librsvg2-dev" - "libsdl1.2-dev" "libsdl2-dev" "libsamplerate0-dev" "libsoundtouch-dev" - "libwxgtk3.0-dev" - "libwxgtk3.0-gtk3-0v5" "libwxgtk3.0-gtk3-dev" "libx11-xcb-dev" - "libxext-dev" - "libxft-dev" "libxml2-dev" - "nvidia-cg-toolkit" "pkg-config" "portaudio19-dev" - "python" "zlib1g-dev" ) +if [ "${COMPILER}" = "gcc" ]; then + BUILD_PACKAGES+=("g++-8-multilib") +else + BUILD_PACKAGES+=("clang") + PCSX2_PACKAGES+=("libstdc++-8-dev") +fi + # - https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md ARCH="" echo "${PLATFORM}" @@ -111,22 +53,12 @@ fi sudo apt-get -qq update # Install packages needed for building -if [ "${COMPILER}" = "gcc" ]; then - BUILD_PACKAGES+=("${GCC_PACKAGES[@]}") -else - BUILD_PACKAGES+=("${CLANG_PACKAGES[@]}") -fi - echo "Will install the following packages for building - ${BUILD_PACKAGES[*]}" #sudo apt remove gcc-9 g++-9 sudo apt-get -y install "${BUILD_PACKAGES[@]}" # Install packages needed by pcsx2 PCSX2_PACKAGES=("${PCSX2_PACKAGES[@]/%/"${ARCH}"}") -if [ "${PLATFORM}" == "x86" ]; then -echo "Installing workaround attempt" -sudo apt-get -y install libgcc-s1:i386 -fi echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES[*]}" sudo apt-get -y install "${PCSX2_PACKAGES[@]}"