From 6804b4136c8c50ce92e6b784db518a7b5e669a81 Mon Sep 17 00:00:00 2001 From: stephan-cr Date: Sun, 18 Jun 2023 11:40:28 +0200 Subject: [PATCH 1/5] Upgrade deprecated actions/checkout@v2 to v3 (#2904) Fixes the following Actions warning: "Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: actions/checkout@v2. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/." --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 700e61130..325b2ca93 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: env: EMACS_VERSION: ${{ matrix.emacs_version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 From cd998078949db70b736c0c3ac77ec23d97686f9a Mon Sep 17 00:00:00 2001 From: stephan-cr Date: Sun, 18 Jun 2023 16:53:50 +0200 Subject: [PATCH 2/5] Add Emacs 28.2 to CI builds and fix newly introduced warnings (#2905) Currently, there are no builds for Emacs 28. Emacs 28 seems have introduced warnings about the line length in code documentation. These warnings have been fixed as well. --- .github/workflows/test.yml | 1 + el-get-check.el | 3 ++- el-get-status.el | 3 ++- el-get.el | 6 ++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 325b2ca93..6112e35cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,7 @@ jobs: - 25.3 - 26.3 - 27.2 + - 28.2 - snapshot env: EMACS_VERSION: ${{ matrix.emacs_version }} diff --git a/el-get-check.el b/el-get-check.el index 87bc20cf9..783e3370b 100644 --- a/el-get-check.el +++ b/el-get-check.el @@ -65,7 +65,8 @@ Current possibe elements are: 1)))) (defun el-get-check-recipe-batch () - "emacs -Q -batch -f el-get-check-recipe-batch [-W<:level>] [-Wno-...] *.rcp + "emacs -Q -batch -f el-get-check-recipe-batch [-W<:level>] +[-Wno-...] *.rcp <:level> can be any valid warning level, see `warning-levels'. See `el-get-check-suppressed-warnings' for possible values." diff --git a/el-get-status.el b/el-get-status.el index b0a254b4d..408773798 100644 --- a/el-get-status.el +++ b/el-get-status.el @@ -331,7 +331,8 @@ REMOVED are added and removed properties, respectively." (defun el-get-merge-properties-into-status (package-or-source operation &rest keys) - "Merge updatable properties for package into package status alist (or status file). + "Merge updatable properties for package into package status +alist (or status file). The first argument is either a package source or a package name, in which case the source will be read using diff --git a/el-get.el b/el-get.el index ebfc71013..2b340a1a1 100644 --- a/el-get.el +++ b/el-get.el @@ -203,7 +203,8 @@ "List of packages to install next, used when dealing with dependencies.") (defun el-get-installation-failed (package signal-data) - "Run all the failure hooks for PACKAGE and `signal' the car and cdr of SIGNAL-DATA." + "Run all the failure hooks for PACKAGE and `signal' the car and +cdr of SIGNAL-DATA." (run-hook-with-args 'el-get-post-error-hooks package signal-data) (signal (car signal-data) (cdr signal-data))) @@ -336,7 +337,8 @@ which defaults to the first element in `el-get-recipe-path'." (eval form el-get-eval-lexical))))) (defun el-get-lazy-run-package-support (form fname package) - "Like `el-get-run-package-support', but using `eval-after-load' to wait until PACKAGE is loaded." + "Like `el-get-run-package-support', but using `eval-after-load' +to wait until PACKAGE is loaded." (el-get-eval-after-load package `(el-get-run-package-support ',form ',fname ',package))) From 887bedb495dc0f843c95173dd75d122293cc8d42 Mon Sep 17 00:00:00 2001 From: stephan-cr Date: Mon, 19 Jun 2023 11:38:53 +0200 Subject: [PATCH 3/5] Remove ERT and "package" installation in CI (#2906) * Remove ERT and "package" installation in CI Since Emacs 23 is dropped for quite some time now, remove installation of ERT and "package", because they are built-in since Emacs 24. * Remove "prereqs" function left-overs --- .github/workflows/test.yml | 6 ------ test/github-actions.sh | 23 +++-------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6112e35cc..df70119e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,15 +39,9 @@ jobs: env emacs --version - - name: Install prereqs - run: | - source test/github-actions.sh - prereqs - - name: Compilation run: | source test/github-actions.sh - byte-compile pkg/*.el byte-compile -Werror *.el methods/*.el - name: Test diff --git a/test/github-actions.sh b/test/github-actions.sh index d95786c02..8cc7b1741 100644 --- a/test/github-actions.sh +++ b/test/github-actions.sh @@ -1,27 +1,10 @@ # source me # Define the following functions here to keep .github/workflows/test.yml nice and tidy -# - prereqs() # - byte-compile() # - check-recipes() # - check-whitespace() # - ert-tests() -# Installs ert and package.el as needed. -prereqs() { - # Put external elisp into pkg/. - (mkdir -p pkg && cd pkg - if ! emacs -Q --batch --eval "(require 'ert)" ; then - ert_compat=https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205 - curl -LO $ert_compat/lisp/emacs-lisp/ert.el \ - -O $ert_compat/lisp/emacs-lisp/ert-x.el - fi - if ! emacs -Q --batch --eval "(require 'package)" ; then - pkg_compat23=https://raw.githubusercontent.com/mirrors/emacs/ba08b24186711eaeb3748f3d1f23e2c2d9ed0d09 - curl -LO $pkg_compat23/lisp/emacs-lisp/package.el \ - -O $pkg_compat23/lisp/emacs-lisp/package-x.el - fi) -} - BASE=$(cat "$GITHUB_EVENT_PATH" | jq -r '.pull_request.base.sha') if [ "$BASE" = 'null' ]; then BASE=$(cat "$GITHUB_EVENT_PATH" | jq -r '.before') @@ -70,7 +53,7 @@ else fi ert-tests() { - emacs -batch -Q $EMACS_OPT -L pkg/ -L . -l test/el-get-tests.el -f ert-run-tests-batch-and-exit + emacs -batch -Q $EMACS_OPT -L . -l test/el-get-tests.el -f ert-run-tests-batch-and-exit } # byte-compile [-Werror] ... @@ -80,7 +63,7 @@ byte-compile() { error_on_warning=t shift fi - emacs -Q -L pkg/ -L . -L methods/ -batch \ + emacs -Q -L . -L methods/ -batch \ --eval "(setq byte-compile-error-on-warn $error_on_warning)" \ -f batch-byte-compile "$@" } @@ -88,4 +71,4 @@ byte-compile() { shopt -s nullglob # show definitions for log -declare -f prereqs byte-compile ert-tests check-recipes check-whitespace +declare -f byte-compile ert-tests check-recipes check-whitespace From d8321df8c44102afcba4d0e5bc6f2c2f85149adc Mon Sep 17 00:00:00 2001 From: pasja Date: Fri, 23 Jun 2023 09:18:54 +0200 Subject: [PATCH 4/5] Fix swiper build (#2907) hydra is a build-time dependency of swiper since https://github.com/abo-abo/swiper/commit/40e017dc1bc4655f7c3cf4bbbe3a827ce2fff213 and this patch follows that change in the recipe Also see https://github.com/abo-abo/swiper/issues/3011 --- recipes/swiper.rcp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/recipes/swiper.rcp b/recipes/swiper.rcp index 55d8b454b..893ad251f 100644 --- a/recipes/swiper.rcp +++ b/recipes/swiper.rcp @@ -1,10 +1,20 @@ (:name swiper :description "Gives you an overview as you search for a regex." :type github - :depends (cl-lib avy) + :depends (cl-lib avy hydra) :pkgname "abo-abo/swiper" - :build `(("make" ,(format "emacs=%s -L %s" el-get-emacs (concat (file-name-as-directory el-get-dir) "avy")) "compile") - ("makeinfo" "-o" "doc/ivy.info" "doc/ivy.texi")) - :build/berkeley-unix `(("gmake" ,(format "emacs=%s -L %s" el-get-emacs (concat (file-name-as-directory el-get-dir) "avy")) "compile") - ("gmakeinfo" "-o" "doc/ivy.info" "doc/ivy.texi")) + :build `(("make" + ,(format "emacs=%s -L %s -L %s" + el-get-emacs + (concat (file-name-as-directory el-get-dir) "avy") + (concat (file-name-as-directory el-get-dir) "hydra")) + "compile") + ("makeinfo" "-o" "doc/ivy.info" "doc/ivy.texi")) + :build/berkeley-unix `(("gmake" + ,(format "emacs=%s -L %s -L %s" + el-get-emacs + (concat (file-name-as-directory el-get-dir) "avy") + (concat (file-name-as-directory el-get-dir) "hydra")) + "compile") + ("gmakeinfo" "-o" "doc/ivy.info" "doc/ivy.texi")) :info "doc/ivy.info") From f3f1edd434221dc6daef565ebf77fa40c4cead36 Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Tue, 25 Jul 2023 09:50:33 +0200 Subject: [PATCH 5/5] Add recipe for lsp-pyright (#2908) --- recipes/lsp-pyright.rcp | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 recipes/lsp-pyright.rcp diff --git a/recipes/lsp-pyright.rcp b/recipes/lsp-pyright.rcp new file mode 100644 index 000000000..16c7be9bb --- /dev/null +++ b/recipes/lsp-pyright.rcp @@ -0,0 +1,5 @@ +(:name lsp-pyright + :description "lsp-mode client leveraging Pyright language server" + :depends (dash lsp-mode ht) + :type github + :pkgname "emacs-lsp/lsp-pyright")