diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2023-04-04 20:01:19 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2023-04-04 20:01:19 +0200 |
| commit | 257090b8728e6457f6d99f8f0bb32d96594d20f4 (patch) | |
| tree | cca0ca90e00fcdf6ba9301b3666752703d8a5518 | |
| parent | 90c07d3fdd2be9b34d34c7fa98e838a54488a997 (diff) | |
| download | emacs-257090b8728e6457f6d99f8f0bb32d96594d20f4.tar.gz | |
Adapt EMBA scripts.
* test/infra/Dockerfile.emba (emacs-gnustep): Add zlib1g-dev.
Remove make instrumentation.
* test/infra/gitlab-ci.yml (build-image-gnustep, test-gnustep): Uncomment.
| -rw-r--r-- | test/infra/Dockerfile.emba | 4 | ||||
| -rw-r--r-- | test/infra/gitlab-ci.yml | 32 |
2 files changed, 17 insertions, 19 deletions
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba index 946aa9235fb..7f12d682a13 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba @@ -64,14 +64,14 @@ FROM emacs-base as emacs-gnustep RUN apt-get update && \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ - gnustep-devel \ + gnustep-devel zlib1g-dev \ && rm -rf /var/lib/apt/lists/* COPY . /checkout WORKDIR /checkout RUN ./autogen.sh autoconf RUN ./configure --with-ns -RUN make V=1 bootstrap +RUN make bootstrap FROM emacs-base as emacs-native-comp diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml index 41778321773..de1148460aa 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml @@ -229,24 +229,22 @@ test-filenotify-gio: # This is needed in order to get a JUnit test report. make_params: '-k -C test check-expensive LOGFILES="lisp/autorevert-tests.log lisp/filenotify-tests.log"' -# The next two jobs are commented out due to bug#62210. - -# build-image-gnustep: -# stage: platform-images -# extends: [.job-template, .build-template, .gnustep-template] -# variables: -# target: emacs-gnustep +build-image-gnustep: + stage: platform-images + extends: [.job-template, .build-template, .gnustep-template] + variables: + target: emacs-gnustep -# test-gnustep: -# # This tests the GNUstep build process. -# stage: platforms -# extends: [.job-template, .gnustep-template] -# needs: -# - job: build-image-gnustep -# optional: true -# variables: -# target: emacs-gnustep -# make_params: install +test-gnustep: + # This tests the GNUstep build process. + stage: platforms + extends: [.job-template, .gnustep-template] + needs: + - job: build-image-gnustep + optional: true + variables: + target: emacs-gnustep + make_params: install # The next two jobs are commented out due to high workload on # emba.gnu.org. |