branch: externals/tramp
commit 26b197ba691140466f15c7cd29cc7db77144444c
Author: Michael Albinus <[email protected]>
Commit: Michael Albinus <[email protected]>

    Improve CI/CD integration
    
    * .elpaignore: Add .gitlab-ci.yml and Eldev.
    
    * .gitlab-ci.yml (variables): Remove.
    (default): Call 'make autoloads'.
    (.eldev): Remove
    (.build): Modify script.
    (.lint): Don't depend on .eldev.  Add before_script.
    (.test): Don't depend on earlier stages.  Modify script.
    (test-28, test-29, test-30, test-master): Don't depend on build-*.
    (Local Variables): Add 'add-log-current-defun-header-regexp'.
    
    * Eldev (eldev-project-main-file): New file.
---
 .elpaignore    |  2 ++
 .gitlab-ci.yml | 39 +++++++++++++++++----------------------
 Eldev          |  5 +++++
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.elpaignore b/.elpaignore
index 549c258b02d..add38bde995 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -2,4 +2,6 @@
 .elpaignore
 .git
 .gitignore
+.gitlab-ci.yml
+Eldev
 README-GIT
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8339de54b3f..816eda71459 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,41 +3,36 @@ stages:
   - lint
   - test
 
-variables:
-  EMACS: emacs -Q -batch -L .
-
 default:
   before_script:
-    - emacs --version
-
-.eldev:
-  variables: {}
-  before_script:
-    - curl -fsSL
-        https://raw.github.com/emacs-eldev/eldev/master/bin/eldev > eldev
-    - chmod a+x eldev
+    - make autoloads
 
 .build:
   stage: build
   needs: []
   script:
-    # - $EMACS -l bytecomp --eval '(setq byte-compile-error-on-warn t)'
-    #     -f batch-byte-compile *.el
-    - $EMACS -l bytecomp -f batch-byte-compile *.el
+    - emacs -Q -batch -L . -l bytecomp
+        --eval '(setq byte-compile-error-on-warn t)'
+        -f batch-byte-compile *.el
 
 .lint:
-  extends: .eldev
   stage: lint
   needs: []
+  before_script:
+    - curl -fsSL
+        https://raw.github.com/emacs-eldev/eldev/master/bin/eldev > eldev
+    - chmod a+x eldev
   script:
     - ./eldev lint all elisp
 
 .test:
   stage: test
+  needs: []
   script:
-    - $EMACS -l bytecomp -f batch-byte-compile *.el test/*.el
-    - $EMACS -L test -l tramp  -l tramp-tests
-        --eval '(ert-run-tests-batch-and-exit (quote (not (tag :unstable))))'
+    - emacs -Q -batch -L . -l bytecomp
+        -f batch-byte-compile *.el
+    - make test TESTS=tramp-tests
+
 
 build-28:
   image: "silex/emacs:28-ci"
@@ -74,19 +69,19 @@ lint-master:
 test-28:
   image: "silex/emacs:28-ci"
   extends: .test
-  needs: ["build-28"]
 
 test-29:
   image: "silex/emacs:29-ci"
   extends: .test
-  needs: ["build-29"]
 
 test-30:
   image: "silex/emacs:30-ci"
   extends: .test
-  needs: ["build-30"]
 
 test-master:
   image: "silex/emacs:master-ci"
   extends: .test
-  needs: ["build-master"]
+
+# Local Variables:
+# add-log-current-defun-header-regexp: "^\\([-_.[:alnum:]]+\\)[ \t]*:"
+# End:
diff --git a/Eldev b/Eldev
new file mode 100644
index 00000000000..ac468a33950
--- /dev/null
+++ b/Eldev
@@ -0,0 +1,5 @@
+;;; -*- mode: emacs-lisp; lexical-binding: t -*-
+
+(setq eldev-project-main-file "tramp.el"
+      eldev-standard-excludes
+      `(:or ,eldev-standard-excludes "./tramp-loaddefs.el"))

Reply via email to