; * test/infra/gitlab-ci.yml: Fix it, again.

test/infra/gitlab-ci.yml

@@ -110,15 +110,7 @@ default:
     - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name}
     - test -n "$(docker ps -aq -f name=${test_name})" && docker rm ${test_name}
 
-# We must declare it here, because it is used in .build-template.
-prep-image-base:
-  stage: prep-images
-  extends: [.job-template, .build-template]
-  variables:
-    target: emacs-base
-
 .build-template:
-  needs: [prep-image-base]
   rules:
     - if: '$CI_PIPELINE_SOURCE == "web"'
       when: always
@@ -224,6 +216,7 @@ prep-image-base:
 build-image-inotify:
   stage: build-images
   extends: [.job-template, .build-template]
+  needs: [prep-image-base]
   variables:
     target: emacs-inotify
 
@@ -251,12 +244,14 @@ test-lisp-net-inotify:
 build-image-filenotify-gio:
   stage: platform-images
   extends: [.job-template, .build-template, .filenotify-gio-template]
+  needs: [prep-image-base]
   variables:
     target: emacs-filenotify-gio
 
 build-image-gnustep:
   stage: platform-images
   extends: [.job-template, .build-template, .gnustep-template]
+  needs: [prep-image-base]
   variables:
     target: emacs-gnustep
 
@@ -281,6 +276,7 @@ test-gnustep:
 build-native-bootstrap-speed0:
   stage: native-comp-images
   extends: [.job-template, .build-template, .native-comp-template]
+  needs: [prep-image-base]
   variables:
     target: emacs-native-comp-speed0