diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:59 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:59 -0400 |
commit | 47bce04e875bdaf4a9e2bb33dc14794d373b676f (patch) | |
tree | d13dae0c30b300e332292f6fb8fd2ce13b500889 /test/infra/gitlab-ci.yml | |
parent | 2b4e14e3abd5be08ee2a4e832b5dbe8172869e24 (diff) | |
parent | 0337131bfa194856234ddfe70ee38b3165d66289 (diff) | |
download | emacs-47bce04e875bdaf4a9e2bb33dc14794d373b676f.tar.gz |
Merge from origin/emacs-29
0337131bfa1 Update to Transient v0.3.7-218-g3dbb22a
a8c23677d39 Update to Org 9.6.2
45b16bfb496 Skip failing tests on Cygwin with native compilation (bug...
8b4a494d8d4 Fix GNUSTEP tests on EMBA
# Conflicts:
# test/infra/gitlab-ci.yml
Diffstat (limited to 'test/infra/gitlab-ci.yml')
-rw-r--r-- | test/infra/gitlab-ci.yml | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml index b000f128278..d1fef0187d4 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml @@ -256,24 +256,22 @@ test-eglot: # This is needed in order to get a JUnit test report. make_params: '-k -C test check-expensive LOGFILES="lisp/progmodes/eglot-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. |