[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0d72bee: Some inmprovements in emba CI files
From: |
Michael Albinus |
Subject: |
master 0d72bee: Some inmprovements in emba CI files |
Date: |
Wed, 29 Sep 2021 03:48:09 -0400 (EDT) |
branch: master
commit 0d72beec9bb8d6131824aab22cab7fe4020027cf
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Some inmprovements in emba CI files
* test/infra/Dockerfile.emba: Remove superfluous "make -j4".
* test/infra/gitlab-ci.yml (.test-template): Add 'allow_failure' clause.
(test-all-inotify): Add 'needs' clause.
---
test/infra/Dockerfile.emba | 4 ----
test/infra/gitlab-ci.yml | 13 ++-----------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 0b69a71..f7cd183 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -45,7 +45,6 @@ RUN ./autogen.sh autoconf
RUN ./configure
# 'make -j4 bootstrap' does not work reliably.
RUN make bootstrap
-RUN make -j4
FROM emacs-base as emacs-filenotify-gio
@@ -59,7 +58,6 @@ WORKDIR /checkout
RUN ./autogen.sh autoconf
RUN ./configure --with-file-notification=gfile
RUN make bootstrap
-RUN make -j4
FROM emacs-base as emacs-gnustep
@@ -73,7 +71,6 @@ WORKDIR /checkout
RUN ./autogen.sh autoconf
RUN ./configure --with-ns
RUN make bootstrap
-RUN make -j4
FROM emacs-base as emacs-native-comp-speed0
@@ -90,4 +87,3 @@ RUN ./autogen.sh autoconf
RUN ./configure --with-native-compilation
RUN make bootstrap -j2 \
NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"'
-RUN make -j4
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index b6243e1..a004705 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -147,6 +147,7 @@ default:
- if: '$CI_JOB_STAGE =~ "fast|normal" && $CI_PIPELINE_SOURCE == "schedule"'
when: never
- when: always
+ allow_failure: true
artifacts:
name: ${test_name}
public: true
@@ -199,7 +200,6 @@ default:
timeout: 8 hours
stages:
-# - prep-images
- build-images
# - fast
- normal
@@ -209,16 +209,9 @@ stages:
- native-comp
- slow
-# prep-image-base:
-# stage: prep-images
-# extends: [.job-template, .build-template]
-# variables:
-# target: emacs-base
-
build-image-inotify:
stage: build-images
extends: [.job-template, .build-template]
-# needs: [prep-image-base]
variables:
target: emacs-inotify
@@ -246,14 +239,12 @@ 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
@@ -278,7 +269,6 @@ 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
@@ -317,6 +307,7 @@ build-native-bootstrap-speed0:
test-all-inotify:
# This tests also file monitor libraries inotify and inotifywatch.
stage: slow
+ needs: [build-image-inotify]
extends: [.job-template, .test-template]
rules:
# note there's no "changes" section, so this always runs on a schedule
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 0d72bee: Some inmprovements in emba CI files,
Michael Albinus <=