hiro/ement.el
1
0
Fork 0
mirror of https://github.com/vale981/ement.el synced 2025-03-04 17:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Meta: Update makem.sh, etc.

Browse source
This commit is contained in:
Adam Porter 2020-12-02 14:24:10 -06:00
parent 2f5bff00a0
commit e71fe3ee31
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/test.yml vendored
View file

@ -1,7 +1,7 @@
# * test.yml --- Test Emacs packages using makem.sh on GitHub Actions # * test.yml --- Test Emacs packages using makem.sh on GitHub Actions
# URL: https://github.com/alphapapa/makem.sh # URL: https://github.com/alphapapa/makem.sh
# Version: 0.4.1 # Version: 0.4.2
# * Commentary: # * Commentary:
@ -31,8 +31,8 @@ on:
pull_request: pull_request:
push: push:
# Comment out this section to enable testing of all branches. # Comment out this section to enable testing of all branches.
# branches: branches:
# - master - master
jobs: jobs:
build: build:
@ -63,7 +63,7 @@ jobs:
- name: Lint - name: Lint
# NOTE: Uncomment this line to treat lint failures as passing # NOTE: Uncomment this line to treat lint failures as passing
# so the job doesn't show failure. # so the job doesn't show failure.
continue-on-error: true # continue-on-error: true
run: ./makem.sh -vv --sandbox=$SANDBOX_DIR lint run: ./makem.sh -vv --sandbox=$SANDBOX_DIR lint
- name: Test - name: Test

2
Makefile
View file

@ -1,7 +1,7 @@
# * makem.sh/Makefile --- Script to aid building and testing Emacs Lisp packages # * makem.sh/Makefile --- Script to aid building and testing Emacs Lisp packages
# URL: https://github.com/alphapapa/makem.sh # URL: https://github.com/alphapapa/makem.sh
# Version: 0.4.1 # Version: 0.4.2
# * Arguments # * Arguments

14
makem.sh
View file

@ -3,7 +3,7 @@
# * makem.sh --- Script to aid building and testing Emacs Lisp packages # * makem.sh --- Script to aid building and testing Emacs Lisp packages
# URL: https://github.com/alphapapa/makem.sh # URL: https://github.com/alphapapa/makem.sh
# Version: 0.4.1 # Version: 0.4.2
# * Commentary: # * Commentary:
@ -233,7 +233,6 @@ function elisp-package-initialize-file {
(cons "melpa-stable" "https://stable.melpa.org/packages/"))) (cons "melpa-stable" "https://stable.melpa.org/packages/")))
$elisp_org_package_archive $elisp_org_package_archive
(package-initialize) (package-initialize)
(setq load-prefer-newer t)
EOF EOF
echo $file echo $file
} }
@ -246,6 +245,7 @@ function run_emacs {
local emacs_command=( local emacs_command=(
"${emacs_command[@]}" "${emacs_command[@]}"
-Q -Q
--eval "(setq load-prefer-newer t)"
"${args_debug[@]}" "${args_debug[@]}"
"${args_sandbox[@]}" "${args_sandbox[@]}"
-l $package_initialize_file -l $package_initialize_file
@ -379,7 +379,8 @@ function args-load-files {
# For file in $@, echo "--load $file". # For file in $@, echo "--load $file".
for file in "$@" for file in "$@"
do do
printf -- '--load %q ' "$file" sans_extension=${file%%.el}
printf -- '--load %q ' "$sans_extension"
done done
} }
@ -766,12 +767,15 @@ function batch {
function interactive { function interactive {
# Run Emacs interactively. Most useful with --sandbox and --install-deps. # Run Emacs interactively. Most useful with --sandbox and --install-deps.
local load_file_args=$(args-load-files "${files_project_feature[@]}" "${files_project_test[@]}")
verbose 1 "Running Emacs interactively..." verbose 1 "Running Emacs interactively..."
verbose 2 "Loading files:" "${files_project_feature[@]}" "${files_project_test[@]}" verbose 2 "Loading files: ${load_file_args//--load /}"
[[ $compile ]] && compile
unset arg_batch unset arg_batch
run_emacs \ run_emacs \
$(args-load-files "${files_project_feature[@]}" "${files_project_test[@]}") \ $load_file_args \
--eval "(load user-init-file)" \ --eval "(load user-init-file)" \
"${args_batch_interactive[@]}" "${args_batch_interactive[@]}"
arg_batch="--batch" arg_batch="--batch"