patch 8.2.4096: Linux CI: unnecessarily installing packages

Problem:    Linux CI: unnecessarily installing packages
Solution:   Only install packages for huge build.  (Ozaki Kiichi,
            closes #9530)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d91b6644b63c4bb00393fc84987040d142627d21..2f0bc49dd1cb97b8a2d92ba8d78d4a7edf95706e 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,25 +63,30 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install packages
-        if: matrix.features == 'huge'
         run: |
-          sudo apt update && sudo apt install -y \
-            autoconf \
-            lcov \
+          PKGS=( \
             gettext \
-            libcanberra-dev \
-            libperl-dev \
-            python-dev \
-            python3-dev \
-            liblua5.3-dev \
-            lua5.3 \
-            ruby-dev \
-            tcl-dev \
-            cscope \
             libgtk2.0-dev \
             desktop-file-utils \
             libtool-bin \
-            libsodium-dev
+          )
+          if ${{ matrix.features == 'huge' }}; then
+            PKGS+=( \
+              autoconf \
+              lcov \
+              libcanberra-dev \
+              libperl-dev \
+              python-dev \
+              python3-dev \
+              liblua5.3-dev \
+              lua5.3 \
+              ruby-dev \
+              tcl-dev \
+              cscope \
+              libsodium-dev \
+            )
+          fi
+          sudo apt update && sudo apt install -y "${PKGS[@]}"
 
       - name: Install clang-13
         if: matrix.compiler == 'clang'
@@ -284,6 +289,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install packages
+        if: matrix.features == 'huge'
         env:
           HOMEBREW_NO_AUTO_UPDATE: 1
         run: |

diff --git a/src/version.c b/src/version.c
index 733021bbabd53a608dc951a54debcf3d19bf652b..ca56f419c6dc750e697490ce14ec09f81d14ef25 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4096,
 /**/
     4095,
 /**/