ci: fix debian selection + apk install

zeromq · Jan 1, 2025 · 3335f18 · 3335f18
1 parent eaece87
commit 3335f18
Showing 1 changed file with 15 additions and 33 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -180,9 +180,9 @@ jobs:
           install: |
             set -x
             case "${{ matrix.distro }}" in
-                ubuntu*|jessie|stretch|buster|bullseye)
-                  apt-get update -q -y
-                  apt-get install --no-install-recommends -y \
+                fedora*)
+                  dnf update -q -y
+                  dnf install -y \
                      bash \
                      build-essential \
                      curl \
@@ -200,12 +200,17 @@ jobs:
                      automake \
                      autoconf \
                      libtool \
-                     nodejs \
-                     npm
+                     nodejs
                  ;;
-                fedora*)
-                  dnf update -q -y
-                  dnf install -y \
+                alpine*)
+                  apk update
+                  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 
+                  cp /usr/lib/ninja-build/bin/ninja /usr/bin/ninja
+                 ;;
+                *)
+                  # Default case (Ubuntu/Debian)
+                  apt-get update -q -y
+                  apt-get install --no-install-recommends -y \
                      bash \
                      build-essential \
                      curl \
@@ -223,31 +228,8 @@ jobs:
                      automake \
                      autoconf \
                      libtool \
-                     nodejs
-                 ;;
-                alpine*)
-                  apk update
-                  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 && \
-                    cp /usr/lib/ninja-build/bin/ninja /usr/bin/ninja
+                     nodejs \
+                     npm
                  ;;
              esac
              npm i -g pnpm