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