Skip to content

Commit 559c3d1

Browse files
authored
simplify deps install, use mesa that does not link to llvm
1 parent 69ecbaf commit 559c3d1

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

.github/workflows/appimage.yml

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -91,36 +91,20 @@ jobs:
9191
# Archlinux
9292
set -ex
9393
94-
sed -i 's/DownloadUser/#DownloadUser/g' /etc/pacman.conf
95-
96-
ARCH=$(uname -m)
97-
echo "ARCH=$ARCH" >> $GITHUB_ENV # Export ARCH to be reused on other steps
98-
if [[ "$ARCH" == "x86_64" ]]; then
99-
PKG_TYPE='x86_64.pkg.tar.zst'
100-
else
101-
PKG_TYPE='aarch64.pkg.tar.xz'
102-
fi
103-
104-
LLVM_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/llvm-libs-nano-$PKG_TYPE"
105-
LIBXML_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/libxml2-iculess-$PKG_TYPE"
106-
OPUS_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/opus-nano-$PKG_TYPE"
94+
EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
10795
10896
echo "Installing build dependencies..."
10997
echo "---------------------------------------------------------------"
11098
pacman -Syu --noconfirm \
11199
base-devel \
112100
curl \
113-
desktop-file-utils \
114101
git \
115102
cmake \
116103
ninja \
117104
clang \
118105
ccache \
119-
llvm-libs \
120-
llvm \
121106
lld \
122107
libxss \
123-
mesa \
124108
fontconfig \
125109
gcc-libs \
126110
glibc \
@@ -138,28 +122,16 @@ jobs:
138122
wget \
139123
xorg-server-xvfb \
140124
zsync \
141-
vulkan-nouveau \
142-
vulkan-radeon \
143125
vulkan-headers \
144126
alsa-lib sndio hidapi ibus jack libdecor libgl libpulse libusb \
145127
libx11 libxcursor libxext libxinerama libxkbcommon libxrandr libxrender libxss libxtst \
146128
wayland wayland-protocols
147-
148-
if [[ "$ARCH" == "x86_64" ]]; then
149-
pacman -Syu --noconfirm vulkan-intel
150-
fi
151-
152-
echo "Installing debloated pckages..."
153-
echo "---------------------------------------------------------------"
154-
wget --retry-connrefused --tries=30 "$LLVM_URL" -O ./llvm-libs.pkg.tar.zst
155-
wget --retry-connrefused --tries=30 "$LIBXML_URL" -O ./libxml2.pkg.tar.zst
156-
wget --retry-connrefused --tries=30 "$OPUS_URL" -O ./opus-nano.pkg.tar.zst
157-
158-
pacman -U --noconfirm ./*.pkg.tar.zst
159-
rm -f ./*.pkg.tar.zst
160-
161-
echo "All done!"
162-
echo "---------------------------------------------------------------"
129+
130+
echo "Installing debloated packages..."
131+
echo "---------------------------------------------------------------"
132+
wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" -O ./get-debloated-pkgs.sh
133+
chmod +x ./get-debloated-pkgs.sh
134+
./get-debloated-pkgs.sh --add-mesa libxml2-mini opus-mini llvm-nano
163135

164136
- name: Build Release
165137
id: version

0 commit comments

Comments
 (0)