diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed57a0e..33e0b85 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,59 +7,36 @@ on: pull_request: jobs: - test-unix: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - emacs-version: - - 27.2 - - snapshot + test: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + emacs-version: + - 27.2 + - snapshot - steps: - - uses: actions/checkout@v2 + steps: + - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: "3.6" - architecture: "x64" + - uses: purcell/setup-emacs@master + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' + with: + version: ${{ matrix.emacs-version }} - - uses: purcell/setup-emacs@master - with: - version: ${{ matrix.emacs-version }} + - uses: jcs090218/setup-emacs-windows@master + if: matrix.os == 'windows-latest' + with: + version: ${{ matrix.emacs-version }} - - uses: cask/setup-cask@master - with: - version: 'snapshot' + - uses: actions/setup-node@v2 + with: + node-version: '14' - - name: Run tests - run: - make ci + - uses: emacs-eask/setup-eask@master + with: + version: 'snapshot' - test-windows: - runs-on: windows-latest - strategy: - matrix: - emacs-version: - - 27.2 - - snapshot - - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v2 - with: - python-version: "3.6" - architecture: "x64" - - - uses: jcs090218/setup-emacs-windows@master - with: - version: ${{ matrix.emacs-version }} - - - uses: cask/setup-cask@master - with: - version: 'snapshot' - - - name: Run tests - run: - make ci + - name: Run tests + run: + make ci diff --git a/.gitignore b/.gitignore index b03b19e..d3f76a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,10 @@ -# ignore these directories. +# ignore these directories /.git /recipes /test vs-dark-theme-pkg.el -# ignore generated files. +# ignore generated files *.elc -# ignore I use to not ignore. -Update_Log.txt -TODO(jenchieh).txt +/.eask diff --git a/Cask b/Cask deleted file mode 100644 index 674fa7e..0000000 --- a/Cask +++ /dev/null @@ -1,8 +0,0 @@ -(source melpa) - -(package-file "vs-dark-theme.el") - -(files "vs-dark-theme.el") - -(development - (depends-on "ert-runner")) diff --git a/Eask b/Eask new file mode 100644 index 0000000..8c35ead --- /dev/null +++ b/Eask @@ -0,0 +1,9 @@ +(source "melpa") + +(package-file "vs-dark-theme.el") + +(development + (depends-on "ert-runner")) + +(setq network-security-level 'low ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432 + byte-compile-error-on-warn nil) diff --git a/Makefile b/Makefile index cbdee52..7793647 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,30 @@ SHELL := /usr/bin/env bash EMACS ?= emacs -CASK ?= cask - -PKG-FILES := vs-dark-theme.el +EASK ?= eask TEST-FILES := $(shell ls test/vs-dark-theme-*.el) -.PHONY: clean checkdoc lint build compile unix-test +.PHONY: clean checkdoc lint install compile unix-test -ci: clean build compile +ci: clean install compile -build: - $(CASK) install +clean: + @echo "Cleaning..." + $(EASK) clean-all + +install: + @echo "Installing..." + $(EASK) install compile: @echo "Compiling..." - @$(CASK) $(EMACS) -Q --batch \ - -L . \ - --eval '(setq byte-compile-error-on-warn t)' \ - -f batch-byte-compile $(PKG-FILES) + $(EASK) compile + +lint: + @echo "Linting..." + $(EASK) lint unix-test: @echo "Testing..." - $(CASK) exec ert-runner -L . $(LOAD-TEST-FILES) -t '!no-win' -t '!org' - -clean: - rm -rf .cask *.elc + $(EASK) exec ert-runner -L . $(LOAD-TEST-FILES) -t '!no-win' -t '!org'