; Further fixes in .gitlab-ci.yml

* .gitlab-ci.yml (stages): Use only test.
(test-filenotify-gio): Install missing libglib2.0 packages.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b65967895d1c1b6fb57d537359a413ac3d81f9a..76f57e9c93942d601ef26aec59cff97a99f9cbae 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,11 +35,10 @@ before_script:
   - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gnutls-dev git
 
 stages:
-  - test-all
-  - test-filenotify-gio
+  - test
 
 test-all:
-  stage: test-all
+  stage: test
   script:
     - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
     - ./autogen.sh autoconf
@@ -50,7 +49,7 @@ test-all:
     - DEBIAN_FRONTEND=noninteractive apt remove --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
 
 test-filenotify-gio:
-  stage: test-filenotify-gio
+  stage: test
   when: always
   only:
     changes:
@@ -58,10 +57,10 @@ test-filenotify-gio:
       - lisp/filenotify.el
       - test/lisp/filenotify-tests.el
   script:
-    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-bin
+    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0
     - ./autogen.sh autoconf
     - ./configure --without-makeinfo --with-file-notification=gfile
     - make bootstrap
     - make -C test filenotify-tests
   after_script:
-    - DEBIAN_FRONTEND=noninteractive apt remove --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-bin
+    - DEBIAN_FRONTEND=noninteractive apt remove --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0