diff --git a/.github/workflows/analyze.yml b/.github/workflows/disabled/analyze.yml similarity index 100% rename from .github/workflows/analyze.yml rename to .github/workflows/disabled/analyze.yml diff --git a/.github/workflows/build.yml b/.github/workflows/disabled/build.yml similarity index 100% rename from .github/workflows/build.yml rename to .github/workflows/disabled/build.yml diff --git a/.github/workflows/compat.yml b/.github/workflows/disabled/compat.yml similarity index 100% rename from .github/workflows/compat.yml rename to .github/workflows/disabled/compat.yml diff --git a/.github/workflows/compile.yml b/.github/workflows/disabled/compile.yml similarity index 100% rename from .github/workflows/compile.yml rename to .github/workflows/disabled/compile.yml diff --git a/.github/workflows/config.yml b/.github/workflows/disabled/config.yml similarity index 100% rename from .github/workflows/config.yml rename to .github/workflows/disabled/config.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/disabled/docker.yml similarity index 100% rename from .github/workflows/docker.yml rename to .github/workflows/disabled/docker.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/disabled/docs.yml similarity index 100% rename from .github/workflows/docs.yml rename to .github/workflows/disabled/docs.yml diff --git a/.github/workflows/emacs.yml b/.github/workflows/disabled/emacs.yml similarity index 100% rename from .github/workflows/emacs.yml rename to .github/workflows/disabled/emacs.yml diff --git a/.github/workflows/exec.yml b/.github/workflows/disabled/exec.yml similarity index 100% rename from .github/workflows/exec.yml rename to .github/workflows/disabled/exec.yml diff --git a/.github/workflows/exit_status.yml b/.github/workflows/disabled/exit_status.yml similarity index 100% rename from .github/workflows/exit_status.yml rename to .github/workflows/disabled/exit_status.yml diff --git a/.github/workflows/global.yml b/.github/workflows/disabled/global.yml similarity index 100% rename from .github/workflows/global.yml rename to .github/workflows/disabled/global.yml diff --git a/.github/workflows/labeler.yml b/.github/workflows/disabled/labeler.yml similarity index 100% rename from .github/workflows/labeler.yml rename to .github/workflows/disabled/labeler.yml diff --git a/.github/workflows/link.yml b/.github/workflows/disabled/link.yml similarity index 100% rename from .github/workflows/link.yml rename to .github/workflows/disabled/link.yml diff --git a/.github/workflows/local.yml b/.github/workflows/disabled/local.yml similarity index 100% rename from .github/workflows/local.yml rename to .github/workflows/disabled/local.yml diff --git a/.github/workflows/options.yml b/.github/workflows/disabled/options.yml similarity index 100% rename from .github/workflows/options.yml rename to .github/workflows/disabled/options.yml diff --git a/.github/workflows/outdated_upgrade.yml b/.github/workflows/disabled/outdated_upgrade.yml similarity index 100% rename from .github/workflows/outdated_upgrade.yml rename to .github/workflows/disabled/outdated_upgrade.yml diff --git a/.github/workflows/search.yml b/.github/workflows/disabled/search.yml similarity index 100% rename from .github/workflows/search.yml rename to .github/workflows/disabled/search.yml diff --git a/.github/workflows/test_buttercup.yml b/.github/workflows/disabled/test_buttercup.yml similarity index 100% rename from .github/workflows/test_buttercup.yml rename to .github/workflows/disabled/test_buttercup.yml diff --git a/.github/workflows/test_ecukes.yml b/.github/workflows/disabled/test_ecukes.yml similarity index 100% rename from .github/workflows/test_ecukes.yml rename to .github/workflows/disabled/test_ecukes.yml diff --git a/.github/workflows/test_ert-runner.yml b/.github/workflows/disabled/test_ert-runner.yml similarity index 100% rename from .github/workflows/test_ert-runner.yml rename to .github/workflows/disabled/test_ert-runner.yml diff --git a/.github/workflows/test_ert.yml b/.github/workflows/disabled/test_ert.yml similarity index 100% rename from .github/workflows/test_ert.yml rename to .github/workflows/disabled/test_ert.yml diff --git a/.github/workflows/update_submodules.yml b/.github/workflows/disabled/update_submodules.yml similarity index 100% rename from .github/workflows/update_submodules.yml rename to .github/workflows/disabled/update_submodules.yml diff --git a/.github/workflows/upgrade-eask.yml b/.github/workflows/disabled/upgrade-eask.yml similarity index 100% rename from .github/workflows/upgrade-eask.yml rename to .github/workflows/disabled/upgrade-eask.yml diff --git a/.github/workflows/webinstall.yml b/.github/workflows/disabled/webinstall.yml similarity index 100% rename from .github/workflows/webinstall.yml rename to .github/workflows/disabled/webinstall.yml diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 66fff457..609665fa 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -32,10 +32,10 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] emacs-version: - - 26.3 - - 27.2 - - 28.2 - - 29.4 + # - 26.3 + # - 27.2 + # - 28.2 + # - 29.4 - 30.1 experimental: [false] include: @@ -71,6 +71,10 @@ jobs: if: matrix.os == 'windows-latest' run: .github/scripts/setup-eask.ps1 + # - name: Testing... + # run: | + # npm run test-unsafe test/jest/install.test.js + - name: Testing... run: | - npm run test-unsafe test/jest/install.test.js + eask install-file ./test/jest/install/foo-mode/ diff --git a/lisp/core/install-file.el b/lisp/core/install-file.el index 50cea82c..7b079f66 100644 --- a/lisp/core/install-file.el +++ b/lisp/core/install-file.el @@ -40,7 +40,7 @@ (let ((pkg-desc (with-temp-buffer (insert-file-contents-literally path) (tar-mode) - (ignore-errors (package-tar-file-info))))) + (eask-ignore-errors-silent (package-tar-file-info))))) (unless pkg-desc ;; `package-dir-info' will return nil if there is no `-pkg.el' ;; and no `.el' files at path @@ -51,7 +51,14 @@ ;; Note `package-dir-info' doesn't work outside of dired mode! (let ((pkg-desc (with-temp-buffer (dired path) - (ignore-errors (package-dir-info))))) + ;; After Emacs 31, the function `package-dir-info' + ;; will respect the marked files. + ;; + ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=78521#17 + (dired-unmark-all-marks) + (eask--unsilent + (message "? %s" (dired-get-marked-files)) + (ignore-errors (package-dir-info)))))) (unless pkg-desc ;; `package-dir-info' will return nil if there is no `-pkg.el' ;; and no `.el' files at path