From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 27 Mar 2023 21:16:59 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47bce04e875bdaf4a9e2bb33dc14794d373b676f;p=emacs.git

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
---

47bce04e875bdaf4a9e2bb33dc14794d373b676f
diff --cc test/infra/gitlab-ci.yml
index b000f128278,de1148460aa..d1fef0187d4
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@@ -239,41 -229,22 +239,39 @@@ 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"'
  
 +build-image-eglot:
 +  stage: platform-images
 +  extends: [.job-template, .build-template, .eglot-template]
 +  variables:
 +    target: emacs-eglot
 +
 +test-eglot:
 +  stage: platforms
 +  extends: [.job-template, .test-template, .eglot-template]
 +  needs:
 +    - job: build-image-eglot
 +      optional: true
 +  variables:
 +    target: emacs-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.