From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 21 May 2021 17:33:42 +0000 (+0200)
Subject: Adapt native-comp entries in gitlab-ci.yml
X-Git-Tag: emacs-28.0.90~2370
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fbbcdea2b94527b5bd476501dd54333eba649e1;p=emacs.git

Adapt native-comp entries in gitlab-ci.yml

* test/infra/gitlab-ci.yml (stages): New stages native-comp-images
and native-comp.
(build-native-bootstrap-speed0): Simplify.
(build-native-bootstrap-speed1, build-native-bootstrap-speed2):
Deactivate temporarily.

* test/infra/gitlab-ci.yml (.build-template): Add 'needs:' clause.
(.native-comp-template): New template.
(build-native-bootstrap-speed0): Use it.
---

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 7914a2c10e7..edaa24cd4ed 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -111,6 +111,7 @@ default:
     - test -n "$(docker ps -aq -f name=${test_name})" && docker rm ${test_name}
 
 .build-template:
+  needs: [prep-image-base]
   rules:
     - if: '$CI_PIPELINE_SOURCE == "web"'
       when: always
@@ -181,6 +182,21 @@ default:
         - test/lisp/autorevert-tests.el
         - test/lisp/filenotify-tests.el
 
+.native-comp-template:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      changes:
+        - "**/Makefile.in"
+        - .gitlab-ci.yml
+        - lisp/emacs-lisp/comp.el
+        - lisp/emacs-lisp/comp-cstr.el
+        - src/comp.{h,m}
+        - test/infra/*
+        - test/src/comp-resources/*.el
+        - test/src/comp-tests.el
+  timeout: 8 hours
+
 stages:
   - prep-images
   - build-images
@@ -257,10 +273,9 @@ test-gnustep:
 
 build-native-bootstrap-speed0:
   stage: native-comp-images
-  extends: [.job-template, .build-template]
+  extends: [.job-template, .build-template, .native-comp-template]
   variables:
     target: emacs-native-comp-speed0
-  timeout: 8 hours
 
 # build-native-bootstrap-speed0:
 #   # Test a full native bootstrap