Adapt gitlab-ci.yml paths

* test/infra/gitlab-ci.yml (.job-template): Increase timeout.
(.job-template, .build-template, .test-template)
(.gnustep-template, .filenotify-gio-template)
(.native-comp-template): Adapt paths.

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 30efe89c067840ce34888e90b2a7ddc38c70bba3..b7bb93d45b517c9c4b695cbcc2e90e6f20167576 100644 (file)
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -69,26 +69,25 @@ default:
     test_name: ${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}
   rules:
     - changes:
-        - "**/Makefile.in"
+        - "**Makefile.in"
         - .gitlab-ci.yml
         - aclocal.m4
         - autogen.sh
         - configure.ac
         - lib/*.{h,c}
-        - lisp/*.el
-        - lisp/**/*.el
+        - lisp/**.el
         - src/*.{h,c}
         - test/infra/*
         - test/lib-src/*.el
-        - test/lisp/*.el
-        - test/lisp/**/*.el
+        - test/lisp/**.el
+        - test/misc/*.el
         - test/src/*.el
     - changes:
         # gfilemonitor, kqueue
         - src/gfilenotify.c
         - src/kqueue.c
         # MS Windows
-        - "**/w32*"
+        - "**w32*"
         # GNUstep
         - lisp/term/ns-win.el
         - src/ns*.{h,m}
@@ -109,7 +108,7 @@ default:
     # TODO: with make -j4 several of the tests were failing, for
     # example shadowfile-tests, but passed without it.
     - 'export PWD=$(pwd)'
-    - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j4 && timeout -s ABRT 1800s make ${make_params}"'
+    - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j4 && timeout -s ABRT 3600s make ${make_params}"'
   after_script:
     # - docker ps -a
     # - printenv
@@ -123,7 +122,7 @@ default:
     - if: '$CI_PIPELINE_SOURCE == "web"'
       when: always
     - changes:
-        - "**/Makefile.in"
+        - "**Makefile.in"
         - .gitlab-ci.yml
         - aclocal.m4
         - autogen.sh
@@ -137,7 +136,7 @@ default:
         - src/gfilenotify.c
         - src/kqueue.c
         # MS Windows
-        - "**/w32*"
+        - "**w32*"
         # GNUstep
         - lisp/term/ns-win.el
         - src/ns*.{h,m}
@@ -158,22 +157,22 @@ default:
     public: true
     expire_in: 1 week
     paths:
-      - "**/*.log"
-      - "**/core"
-      - core
+      - "**.log"
+      - "**core"
+    when: always
 
 .gnustep-template:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       changes:
-        - "**/Makefile.in"
+        - "**Makefile.in"
         - .gitlab-ci.yml
         - configure.ac
         - src/ns*.{h,m}
         - src/macfont.{h,m}
         - lisp/term/ns-win.el
-        - nextstep/**/*
+        - nextstep/**
         - test/infra/*
 
 .filenotify-gio-template:
@@ -181,7 +180,7 @@ default:
     - if: '$CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       changes:
-        - "**/Makefile.in"
+        - "**Makefile.in"
         - .gitlab-ci.yml
         - lisp/autorevert.el
         - lisp/filenotify.el
@@ -196,7 +195,7 @@ default:
     - if: '$CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       changes:
-        - "**/Makefile.in"
+        - "**Makefile.in"
         - .gitlab-ci.yml
         - lisp/emacs-lisp/comp.el
         - lisp/emacs-lisp/comp-cstr.el