summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Petton2021-03-16 21:53:55 +0100
committerGravatar GitHub2021-03-16 21:53:55 +0100
commitfcafdd8736b3c383260f0bbe6b63b52208a9e774 (patch)
tree2fb62bf1f7912654832c621a211bf982a0433e1a
parent12d90831bbfd590f3c9090b6575826f3ff34765d (diff)
parent41eb1ec1508b92382fcec9f9752bfad5dcc8b49a (diff)
downloadnroam-fcafdd8736b3c383260f0bbe6b63b52208a9e774.tar.gz
nroam-fcafdd8736b3c383260f0bbe6b63b52208a9e774.zip
Merge pull request #17 from NicolasPetton/fix-build
Makefile: Use melpa to fix build
-rw-r--r--.github/workflows/test.yml1
-rw-r--r--Makefile8
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e2d1c4..c288acb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,4 +23,5 @@ jobs:
- name: Test the project
run: |
make ci-dependencies
+ emacs --version
make check
diff --git a/Makefile b/Makefile
index 349145d..a0ab377 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,10 @@
-ELPA_DEPENDENCIES=package-lint
+# Dependencies to install. The project depends on a version of org
+# that is more recent than the one provided by Emacs 27.1. Because
+# makel will refuse to install org because it is built into Emacs, we
+# force a newer version by asking org-plus-contrib instead.
+ELPA_DEPENDENCIES=package-lint org-plus-contrib org-roam
-ELPA_ARCHIVES=melpa-stable gnu
+ELPA_ARCHIVES=melpa org
LINT_CHECKDOC_FILES=$(wildcard *.el)
LINT_PACKAGE_LINT_FILES=nroam.el