fix(generate/workflow): Include logic incorrect

emacs-eask · Jan 28, 2024 · f643c5d · f643c5d
1 parent d637de7
commit f643c5d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 27 deletions.
diff --git a/lisp/generate/workflow/circle-ci.el b/lisp/generate/workflow/circle-ci.el
@@ -67,15 +67,15 @@
             (end-of-line)
             (let ((spaces (spaces-string (current-column))))
               (delete-region (line-beginning-position) (line-end-position))
-              (when (version<= minimum-version "26.1")
+              (when (version<= minimum-version "26.3")
                 (insert spaces "- test-ubuntu-emacs-26" "\n"))
-              (when (version<= minimum-version "27.1")
+              (when (version<= minimum-version "27.2")
                 (insert spaces "- test-ubuntu-emacs-27" "\n"))
-              (when (version<= minimum-version "28.1")
+              (when (version<= minimum-version "28.2")
                 (insert spaces "- test-ubuntu-emacs-28" "\n"))
-              (when (version<= minimum-version "29.1")
+              (when (version<= minimum-version "29.2")
                 (insert spaces "- test-ubuntu-emacs-29" "\n"))
-              (when (version<= minimum-version "30.1")
+              (when (version<= minimum-version "30")
                 (insert spaces "- test-ubuntu-emacs-master"))))
           (save-buffer))
         "done ✓")

diff --git a/lisp/generate/workflow/github.el b/lisp/generate/workflow/github.el
@@ -41,16 +41,33 @@
             (end-of-line)
             (let ((spaces (spaces-string (current-column))))
               (delete-region (line-beginning-position) (line-end-position))
-              (when (version<= minimum-version "26.1")
-                (insert spaces "- 26.3" "\n"))
-              (when (version<= minimum-version "27.1")
-                (insert spaces "- 27.2" "\n"))
-              (when (version<= minimum-version "28.1")
-                (insert spaces "- 28.2" "\n"))
-              (when (version<= minimum-version "29.1")
-                (insert spaces "- 29.1" "\n"))
-              (when (version<= minimum-version "30.1")
-                (insert spaces "- snapshot"))))
+              (message "minimum-version: %s" minimum-version)
+              (message "version<= minimum-version 27.1 ---- %s" (version<= minimum-version "27.1"))
+              (when (version<= minimum-version "26.3")
+                (insert spaces "  - 26.3" "\n"))
+              (when (version<= minimum-version "27.2")
+                (insert spaces "  - 27.2" "\n"))
+              (when (version<= minimum-version "28.2")
+                (insert spaces "  - 28.2" "\n"))
+              (when (version<= minimum-version "29.2")
+                (insert spaces "  - 29.2" "\n"))
+              (when (version<= minimum-version "30")
+                (insert spaces "experimental: [false]" "\n")
+                (insert spaces "include:" "\n")
+                (insert spaces "- os: ubuntu-latest" "\n")
+                (insert spaces "  emacs-version: snapshot" "\n")
+                (insert spaces "  experimental: true" "\n")
+                (insert spaces "- os: macos-latest" "\n")
+                (insert spaces "  emacs-version: snapshot" "\n")
+                (insert spaces "  experimental: true" "\n")
+                (insert spaces "- os: windows-latest" "\n")
+                (insert spaces "  emacs-version: snapshot" "\n")
+                (insert spaces "  experimental: true")
+
+                (goto-char (point-min))
+                (when (search-forward "runs-on:" nil t)
+                  (end-of-line)
+                  (insert "\n    continue-on-error: ${{ matrix.experimental }}")))))
           (save-buffer))
         "done ✓")
       (eask-msg "")

diff --git a/lisp/generate/workflow/gitlab.el b/lisp/generate/workflow/gitlab.el
@@ -47,15 +47,15 @@
           (when (search-forward "{ EMACS_VERSION }" nil t)
             (search-backward "{ EMACS_VERSION }" nil t)
             (delete-region (point) (line-end-position))
-            (when (version<= minimum-version "26.1")
+            (when (version<= minimum-version "26.3")
               (eask--gitlab-insert-jobs "26.3"))
-            (when (version<= minimum-version "27.1")
+            (when (version<= minimum-version "27.2")
               (eask--gitlab-insert-jobs "27.2"))
-            (when (version<= minimum-version "28.1")
+            (when (version<= minimum-version "28.2")
               (eask--gitlab-insert-jobs "28.2"))
-            (when (version<= minimum-version "29.1")
-              (eask--gitlab-insert-jobs "29.1"))
-            (when (version<= minimum-version "30.1")
+            (when (version<= minimum-version "29.2")
+              (eask--gitlab-insert-jobs "29.2"))
+            (when (version<= minimum-version "30")
               ;; TODO: snapshot?
               ))
           (delete-trailing-whitespace)

diff --git a/lisp/generate/workflow/travis-ci.el b/lisp/generate/workflow/travis-ci.el
@@ -39,15 +39,15 @@
             (end-of-line)
             (let ((spaces (spaces-string (current-column))))
               (delete-region (line-beginning-position) (line-end-position))
-              (when (version<= minimum-version "26.1")
+              (when (version<= minimum-version "26.3")
                 (insert spaces "- EMACS_CI=emacs-26-3" "\n"))
-              (when (version<= minimum-version "27.1")
+              (when (version<= minimum-version "27.2")
                 (insert spaces "- EMACS_CI=emacs-27-2" "\n"))
-              (when (version<= minimum-version "28.1")
+              (when (version<= minimum-version "28.2")
                 (insert spaces "- EMACS_CI=emacs-28-2" "\n"))
-              (when (version<= minimum-version "29.1")
-                (insert spaces "- EMACS_CI=emacs-29-1" "\n"))
-              (when (version<= minimum-version "30.1")
+              (when (version<= minimum-version "29.2")
+                (insert spaces "- EMACS_CI=emacs-29-2" "\n"))
+              (when (version<= minimum-version "30")
                 (insert spaces "- EMACS_CI=emacs-snapshot"))))
           (save-buffer))
         "done ✓")