Skip to content

Commit

Permalink
Meta: Update makem.sh, Makefile, test.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
alphapapa committed Nov 16, 2020
1 parent 244c829 commit ec0f8c7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# * test.yml --- Test Emacs packages using makem.sh on GitHub Actions

# https://github.com/alphapapa/makem.sh
# URL: https://github.com/alphapapa/makem.sh
# Version: 0.2

# * Commentary:

# Based on Steve Purcell's examples at
# <https://github.com/purcell/setup-emacs/blob/master/.github/workflows/test.yml>,
Expand Down Expand Up @@ -39,6 +42,7 @@ jobs:
matrix:
emacs_version:
- 26.3
- 27.1
- snapshot
steps:
- uses: purcell/setup-emacs@master
Expand All @@ -50,7 +54,7 @@ jobs:
- name: Initialize sandbox
run: |
SANDBOX_DIR=$(mktemp -d) || exit 1
echo ::set-env name=SANDBOX_DIR::$SANDBOX_DIR
echo "SANDBOX_DIR=$SANDBOX_DIR" >> $GITHUB_ENV
./makem.sh -vv --sandbox=$SANDBOX_DIR --install-deps --install-linters
# The "all" rule is not used, because it treats compilation warnings
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# * makem.sh/Makefile --- Script to aid building and testing Emacs Lisp packages

# This Makefile is from the makem.sh repo: <https://github.com/alphapapa/makem.sh>.
# URL: https://github.com/alphapapa/makem.sh
# Version: 0.2

# * Arguments

Expand Down
3 changes: 2 additions & 1 deletion makem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

# * makem.sh --- Script to aid building and testing Emacs Lisp packages

# https://github.com/alphapapa/makem.sh
# URL: https://github.com/alphapapa/makem.sh
# Version: 0.2

# * Commentary:

Expand Down
16 changes: 8 additions & 8 deletions notes.org
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#+BEGIN: org-ql :query "todo: priority:A" :columns ((priority "P") ((property "milestone") "M") todo heading) :sort (priority date) :take 7
| P | M | Todo | Heading |
|---+-----+---------+--------------------------------------------------------------|
| A | 0.5 | TODO | [[Add Emacs 27.1 to =test.yml=][Add Emacs 27.1 to =test.yml=]] |
| A | | NEXT | [[Make dynamic blocks warn about sexp queries][Make dynamic blocks warn about sexp queries]] |
| A | 0.5 | PROJECT | [[Compatibility with Org 9.4 custom link changes][Compatibility with Org 9.4 custom link changes]] |
| A | | PROJECT | [[Convert simple sexp queries to non-sexp][Convert simple sexp queries to non-sexp]] |
Expand Down Expand Up @@ -68,7 +67,6 @@
#+BEGIN: org-ql :query "todo: property:milestone" :columns (((property "milestone") "M") (priority "P") todo heading) :sort (priority date) :take 7
| M | P | Todo | Heading |
|-----+---+---------+--------------------------------------------------------------|
| 0.5 | A | TODO | [[Add Emacs 27.1 to =test.yml=][Add Emacs 27.1 to =test.yml=]] |
| 0.5 | A | PROJECT | [[Compatibility with Org 9.4 custom link changes][Compatibility with Org 9.4 custom link changes]] |
| 0.5 | A | TODO | [[Tag org-super-agenda 1.2 and bump required version in org-ql][Tag org-super-agenda 1.2 and bump required version in org-ql]] |
| 0.6 | B | PROJECT | [[Save view to dynamic block][Save view to dynamic block]] |
Expand All @@ -79,7 +77,6 @@
:TOC: :include descendants :depth 1
:END:
:CONTENTS:
- [[#add-emacs-271-to-testyml][Add Emacs 27.1 to test.yml]]
- [[#add-auto-keyword-to-planning-predicate][Add :auto keyword to (planning) predicate]]
- [[#change-deadlines-auto-argument-to-auto-andor-auto-t][Change (deadline)'s auto argument to :auto and/or :auto t]]
- [[#outline-path-in-buffers-files-arg][Outline path in buffers-files arg]]
Expand Down Expand Up @@ -109,6 +106,7 @@
- [[#update-view-screenshots][Update view screenshots]]
- [[#test-caching][Test caching]]
- [[#node-caching]["Node" caching]]
- [[#add-emacs-271-to-testyml][Add Emacs 27.1 to test.yml]]
- [[#fix-org-ql-view--link-open-on-org-93][Fix org-ql-view--link-open on Org 9.3+]]
- [[#fix-query-sexp-to-string-functions-handling-of-eg-descendants][Fix query-sexp-to-string function's handling of, e.g. descendants]]
- [[#helm-command][Helm command]]
Expand All @@ -120,11 +118,6 @@
- [[#use-macros-for-date][Use macros for date]]
:END:

** TODO [#A] Add Emacs 27.1 to =test.yml=
:PROPERTIES:
:milestone: 0.5
:END:

** TODO [#B] Add ~:auto~ keyword to ~(planning)~ predicate

It should act like ~(or (deadline auto) (scheduled :to today))~.
Expand Down Expand Up @@ -1401,6 +1394,13 @@ This works okay (except the priority accessor needs to be fixed, because Org pri
:action #'helm-org-goto-marker))))
#+END_SRC

** DONE [#A] Add Emacs 27.1 to =test.yml=
:PROPERTIES:
:milestone: 0.5
:END:

[2020-11-16 Mon 05:22] Also releasing =makem.sh= 0.2 with this change.

** DONE [#A] Fix =org-ql-view--link-open= on Org 9.3+ :compatibility:bug:
:PROPERTIES:
:milestone: 0.5
Expand Down

0 comments on commit ec0f8c7

Please sign in to comment.