Skip to content

Commit

Permalink
ci: update
Browse files Browse the repository at this point in the history
  • Loading branch information
jcs090218 committed Apr 18, 2022
1 parent 76b8b42 commit 3a7191e
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 19 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ on:
- master
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
emacs-version:
Expand Down
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
# ignore these directories
/.git
/recipes

# ignore generated files
*.elc
/test/ert.el

# eask packages
.eask/
dist/

# packaging
*-autoloads.el
*-pkg.el
12 changes: 9 additions & 3 deletions Eask
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
(source "melpa")
(package "popwin"
"1.0.2"
"Popup Window Manager")

(package-file "popwin.el")

(setq network-security-level 'low ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
byte-compile-error-on-warn nil)
(source "gnu")
(source "melpa")

(depends-on "emacs" "24.3")

(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
21 changes: 10 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,25 @@ EASK ?= eask

TEST-FILES := $(shell ls test/popwin-*.el)

.PHONY: clean checkdoc lint install compile unix-test
.PHONY: clean checkdoc lint package install compile test

ci: clean install compile
ci: clean package install compile test

clean:
@echo "Cleaning..."
$(EASK) clean-all
package:
@echo "Packaging..."
$(EASK) package

install:
@echo "Installing..."
$(EASK) install
$(EASK) install --dev

compile:
@echo "Compiling..."
$(EASK) compile

lint:
@echo "Linting..."
$(EASK) lint

unix-test:
test:
@echo "Testing..."
$(EASK) exec ert-runner -L . $(LOAD-TEST-FILES) -t '!no-win' -t '!org'

clean:
rm -rf .eask *.elc

0 comments on commit 3a7191e

Please sign in to comment.