[nongnu] elpa/slime 35bf221443 3/3: Merge remote-tracking branch 'refs/remotes/upstream/slime/main' into elpa--merge/slime

[ELPA Syncer]

branch: elpa/slime
commit 35bf22144366986da6cda9f4617d175f5e813f82
Merge: b920536072 9984e46d52
Author: ELPA Syncer <elpasync@gnu.org>
Commit: ELPA Syncer <elpasync@gnu.org>

    Merge remote-tracking branch 'refs/remotes/upstream/slime/main' into 
elpa--merge/slime
---
 .github/workflows/ci.yml | 8 +++++---
 slime-tests.el           | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b0d7664743..f08b15dbff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
+
     strategy:
       matrix:
         lisp: [ccl, sbcl]
@@ -17,10 +19,10 @@ jobs:
       fail-fast: false
     steps:
 
-    - uses: cachix/install-nix-action@v20
+    - uses: cachix/install-nix-action@v25
       with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - uses: purcell/setup-emacs@master
+        nix_path: nixpkgs=channel:nixos-23.11
+    - uses: purcell/setup-emacs@v6.0
       with:
         version: ${{ matrix.emacs_version }}
     - uses: actions/checkout@v2
diff --git a/slime-tests.el b/slime-tests.el
index de8ee3c102..cc68339334 100644
--- a/slime-tests.el
+++ b/slime-tests.el
@@ -60,7 +60,7 @@ Exits Emacs when finished. The exit code is the number of 
failed tests."
         (when timed-out
           (when noninteractive
             (kill-emacs 252)))))
-    (slime-sync-to-top-level 5)
+    (slime-sync-to-top-level 30)
     (let* ((selector (if randomize
                          `(member ,@(slime-shuffle-list
                                      (ert-select-tests (or test-name t) t)))
@@ -1177,7 +1177,7 @@ on *DEBUGGER-HOOK*."
 (def-slime-test end-of-file
     (expr)
     "Signalling END-OF-FILE should invoke the debugger."
-    '(((cl:error 'cl:end-of-file))
+    '(((cl:error 'cl:end-of-file :stream cl:*standard-input*))
       ((cl:read-from-string "")))
   (let ((value (slime-eval
                 `(cl:let ((condition nil))