From 17326d5c434282323b5ad4727d25696d08cabd4f Mon Sep 17 00:00:00 2001 From: Christian Schwarzgruber Date: Sun, 7 Jan 2024 16:26:15 +0100 Subject: [PATCH] Switch to GitHub actions --- .github/workflows/test.yml | 38 ++++++++++++++++++++++++++++++++++++++ .travis.yml | 22 ---------------------- README.org | 8 ++++---- 3 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/test.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..30ab9bb --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,38 @@ +name: CI + +on: + pull_request: + push: + paths-ignore: + - CHANGELOG + - CONTRIBUTORS + - LICENSE + - README.org + - org-journal.svg + +jobs: + build: + runs-on: ubuntu-latest + continue-on-error: ${{ matrix.experimental }} + strategy: + matrix: + emacs_version: + - 25.1 + - 26.1 + - 27.1 + - 28.1 + - 29.1 + - release-snapshot + experimental: [false] + include: + - emacs_version: snapshot + experimental: true + steps: + - uses: purcell/setup-emacs@master + with: + version: ${{ matrix.emacs_version }} + + - uses: actions/checkout@v4 + + - name: Run tests + run: make all diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 336a3b1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: generic - -env: - global: - - CURL="curl -fsSkL --retry 9 --retry-delay 9" - matrix: - - EMACS_VERSION=26.1 - - EMACS_VERSION=27.1 - - EMACS_VERSION=master - -matrix: - allow_failures: - - env: EMACS_VERSION=master - -install: - - $CURL -L -O https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz - - tar -xaf emacs-bin-${EMACS_VERSION}.tar.gz -C / - - export EMACS=/tmp/emacs/bin/emacs - - $EMACS --version - -script: - make all EMACS=${EMACS} diff --git a/README.org b/README.org index da3e938..e60d378 100644 --- a/README.org +++ b/README.org @@ -1,4 +1,4 @@ -[[https://travis-ci.org/bastibe/org-journal][file:https://travis-ci.org/bastibe/org-journal.svg?branch=master]] [[https://elpa.nongnu.org/nongnu/org-journal.html][https://elpa.nongnu.org/nongnu/org-journal.svg]] [[http://melpa.org/#/org-journal][file:http://melpa.org/packages/org-journal-badge.svg]] [[http://stable.melpa.org/#/org-journal][file:http://stable.melpa.org/packages/org-journal-badge.svg]] [[contributors][file:https://img.shields.io/github/contributors/bastibe/org-journal.svg]] [[license][file:https://img.shields.io/github/license/bastibe/org-journal.svg]] +[[https://github.com/bastibe/org-journal/actions/workflows/test.yml][file:https://github.com/bastibe/org-journal.svg?branch=master]] [[https://elpa.nongnu.org/nongnu/org-journal.html][https://elpa.nongnu.org/nongnu/org-journal.svg]] [[http://melpa.org/#/org-journal][file:http://melpa.org/packages/org-journal-badge.svg]] [[http://stable.melpa.org/#/org-journal][file:http://stable.melpa.org/packages/org-journal-badge.svg]] [[contributors][file:https://img.shields.io/github/contributors/bastibe/org-journal.svg]] [[license][file:https://img.shields.io/github/license/bastibe/org-journal.svg]] #+CAPTION: The org-journal logo [[./org-journal.svg]] @@ -306,11 +306,11 @@ empty string =""=. Any [[http://orgmode.org/manual/Matching-tags-and-properties. todo states are allowed. By default this is ~TODO=”TODO”~. Which will match TODO items. -The old carryover items in the previous day's journal are processed by the function assigned to =org-journal-handle-old-carryover= variable. +The old carryover items in the previous day's journal are processed by the function assigned to =org-journal-handle-old-carryover= variable. Default is to remove all of them. You can change this behavior by assigning a custom fuction to the variable. Your function has to take one argument, which is a list of old carryover entries. The list is in form of ((START_POINT (END_POINT . "TEXT")) ... (START_POINT (END_POINT . "TEXT"))); and in ascending order of START_POINT. - + For example, you can choose putting a tag on the old carryover entries intead of removing them: #+begin_src elisp @@ -319,7 +319,7 @@ For example, you can choose putting a tag on the old carryover entries intead of (let ((matcher (cdr (org-make-tags-matcher org-journal-carryover-items)))) (dolist (entry (reverse old_carryover)) (save-restriction - (narrow-to-region (car entry) (cadr entry)) + (narrow-to-region (car entry) (cadr entry)) (goto-char (point-min)) (org-scan-tags '(lambda () (org-set-tags ":carried:"))