Skip to content

Commit 3335f18

Browse files
committed
ci: fix debian selection + apk install
1 parent eaece87 commit 3335f18

File tree

1 file changed

+15
-33
lines changed

1 file changed

+15
-33
lines changed

.github/workflows/CI.yml

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ jobs:
180180
install: |
181181
set -x
182182
case "${{ matrix.distro }}" in
183-
ubuntu*|jessie|stretch|buster|bullseye)
184-
apt-get update -q -y
185-
apt-get install --no-install-recommends -y \
183+
fedora*)
184+
dnf update -q -y
185+
dnf install -y \
186186
bash \
187187
build-essential \
188188
curl \
@@ -200,12 +200,17 @@ jobs:
200200
automake \
201201
autoconf \
202202
libtool \
203-
nodejs \
204-
npm
203+
nodejs
205204
;;
206-
fedora*)
207-
dnf update -q -y
208-
dnf install -y \
205+
alpine*)
206+
apk update
207+
apk add --no-cache bash build-base curl git g++ make ninja-build pkgconfig unzip zip python3 tar cmake musl-dev automake autoconf libtool nodejs npm
208+
cp /usr/lib/ninja-build/bin/ninja /usr/bin/ninja
209+
;;
210+
*)
211+
# Default case (Ubuntu/Debian)
212+
apt-get update -q -y
213+
apt-get install --no-install-recommends -y \
209214
bash \
210215
build-essential \
211216
curl \
@@ -223,31 +228,8 @@ jobs:
223228
automake \
224229
autoconf \
225230
libtool \
226-
nodejs
227-
;;
228-
alpine*)
229-
apk update
230-
apk add --no-cache \
231-
bash \
232-
build-base \
233-
curl \
234-
git \
235-
g++ \
236-
make \
237-
ninja-build \
238-
pkgconfig \
239-
unzip \
240-
zip \
241-
python3 \
242-
tar \
243-
cmake \
244-
musl-dev \
245-
automake \
246-
autoconf \
247-
libtool \
248-
nodejs \
249-
npm && \
250-
cp /usr/lib/ninja-build/bin/ninja /usr/bin/ninja
231+
nodejs \
232+
npm
251233
;;
252234
esac
253235
npm i -g pnpm

0 commit comments

Comments
 (0)