Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Simplify CI process #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,24 @@ jobs:
- 27.2
- snapshot
steps:
- uses: actions/checkout@v2

- uses: purcell/setup-emacs@master
with:
version: ${{ matrix.emacs-version }}

- uses: actions/checkout@v2
- name: Test package
run: sh ./scripts/test-pkg.sh
- uses: actions/setup-python@v2
with:
python-version: "3.6"
architecture: "x64"

- uses: conao3/setup-cask@master
with:
version: 0.8.4

- name: Run tests
run:
make compile

test-windows:
runs-on: ${{ matrix.os }}
Expand All @@ -45,10 +56,21 @@ jobs:
- 27.2
- snapshot
steps:
- uses: actions/checkout@v2

- uses: jcs090218/setup-emacs-windows@master
with:
version: ${{ matrix.emacs-version }}

- uses: actions/checkout@v2
- name: Test package
run: ./scripts/test-pkg.bat
- uses: actions/setup-python@v2
with:
python-version: "3.6"
architecture: "x64"

- uses: conao3/setup-cask@master
with:
version: 0.8.4

- name: Run tests
run:
make compile
1 change: 1 addition & 0 deletions Cask
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
(files "*.el" "*.org" "banners")

(development
(depends-on "elisp-lint")
(depends-on "page-break-lines"))
25 changes: 12 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
export EMACS ?= emacs
export BATCH = --batch -q -l .emacs/init.el

EMACS ?= emacs
CASK ?= cask

ELLP := $(shell find . -regex '.*elisp-lint-[0-9]+\.[0-9]+')
ELS = $(filter-out emacs-dashboard-autoloads.el,$(wildcard *.el))
OBJECTS = $(ELS:.el=.elc)
BACKUPS = $(ELS:.el=.el~)

.PHONY: version lint clean cleanelpa

.elpa:
$(EMACS) $(BATCH)
touch .elpa

version: .elpa
$(EMACS) $(BATCH) --version
.PHONY: lint clean compile

lint: .elpa
lint:
$(EMACS) $(BATCH) -l $(ELLP)/elisp-lint.el -f elisp-lint-files-batch --no-package-lint $(ELS)

clean:
rm -f $(OBJECTS) $(BACKUPS) emacs-dashboard-autoloads.el*
rm -rf .cask *.elc

cleanelpa: clean
rm -rf .emacs/elpa .emacs/quelpa .emacs/.emacs-custom.el* .elpa
compile:
@echo "Compiling..."
@$(CASK) $(EMACS) -Q --batch \
-L . \
--eval '(setq byte-compile-error-on-warn t)' \
-f batch-byte-compile $(ELS)
1 change: 1 addition & 0 deletions dashboard-widgets.el
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
(declare-function org-get-todo-state "ext:org.el")
(declare-function org-entry-is-todo-p "ext:org.el")
(declare-function org-release-buffers "ext:org.el")
(declare-function recentf-cleanup "ext:recentf.el")
(defalias 'org-time-less-p 'time-less-p)
(defvar org-level-faces)
(defvar org-agenda-new-buffers)
Expand Down
10 changes: 6 additions & 4 deletions dashboard.el
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
(require 'recentf)
(require 'dashboard-widgets)

(declare-function page-break-lines-mode "ext:page-break-lines.el")

(defgroup dashboard nil
"Extensible startup screen."
:group 'applications)

;; Custom splash screen
(defvar dashboard-mode-map
(let ((map (make-sparse-keymap)))
Expand Down Expand Up @@ -67,10 +73,6 @@
buffer-read-only t
truncate-lines t))

(defgroup dashboard nil
"Extensible startup screen."
:group 'applications)

(defcustom dashboard-center-content nil
"Whether to center content within the window."
:type 'boolean
Expand Down
37 changes: 0 additions & 37 deletions scripts/pkg-prepare.el

This file was deleted.

9 changes: 0 additions & 9 deletions scripts/test-pkg.bat

This file was deleted.

19 changes: 0 additions & 19 deletions scripts/test-pkg.el

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/test-pkg.sh

This file was deleted.