emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/popup e112ef1cc6: Replace Cask with Eask


From: ELPA Syncer
Subject: [nongnu] elpa/popup e112ef1cc6: Replace Cask with Eask
Date: Thu, 17 Mar 2022 15:03:04 -0400 (EDT)

branch: elpa/popup
commit e112ef1cc6c86151ea97a0bad49026fbbacc768c
Author: Jen-Chieh Shen <jcs090218@gmail.com>
Commit: Jen-Chieh Shen <jcs090218@gmail.com>

    Replace Cask with Eask
---
 .github/workflows/test.yml | 68 ++++++++++++++++++++++------------------------
 .gitignore                 |  1 +
 Cask                       |  7 -----
 Eask                       | 10 +++++++
 Makefile                   | 33 +++++++++++-----------
 5 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e75bce8b62..33e0b8561a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,38 +7,36 @@ on:
   pull_request:
 
 jobs:
-    unix-test:
-        runs-on: ubuntu-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: purcell/setup-emacs@master
-              with:
-                  version: ${{ matrix.emacs-version }}
-
-            - uses: cask/setup-cask@master
-              with:
-                  version: 'snapshot'
-
-            - name: Setup cmake
-              uses: jwlawson/actions-setup-cmake@v1.4
-              with:
-                 cmake-version: '3.18.x'
-
-            - name: Check cmake
-              run: "cmake --version"
-
-            - name: Run tests
-              run:
-                make unix-ci
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        emacs-version:
+          - 27.2
+          - snapshot
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: purcell/setup-emacs@master
+      if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+      with:
+        version: ${{ matrix.emacs-version }}
+
+    - uses: jcs090218/setup-emacs-windows@master
+      if: matrix.os == 'windows-latest'
+      with:
+        version: ${{ matrix.emacs-version }}
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '14'
+
+    - uses: emacs-eask/setup-eask@master
+      with:
+        version: 'snapshot'
+
+    - name: Run tests
+      run:
+        make ci
diff --git a/.gitignore b/.gitignore
index e15865d013..eea5d1d1db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.cask/
+/.eask/
 *.elc
diff --git a/Cask b/Cask
deleted file mode 100644
index c7b2ddb4bd..0000000000
--- a/Cask
+++ /dev/null
@@ -1,7 +0,0 @@
-(source gnu)
-(source melpa)
-
-(package-file "popup.el")
-
-(development
- (depends-on "ert"))
diff --git a/Eask b/Eask
new file mode 100644
index 0000000000..403c4a2c98
--- /dev/null
+++ b/Eask
@@ -0,0 +1,10 @@
+(source "gnu")
+(source "melpa")
+
+(package-file "popup.el")
+
+(development
+ (depends-on "ert"))
+
+(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 435f29d4c1..8cc8492ce9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,30 @@
 SHELL := /usr/bin/env bash
 
 EMACS ?= emacs
-CASK ?= cask
+EASK ?= eask
 
-PKG-FILES := popup.el
+TEST-FILES := $(shell ls test/grammarly-*.el)
 
-TEST-FILES := $(shell ls test/popup-*.el)
+.PHONY: clean checkdoc lint install compile unix-test
 
-.PHONY: clean checkdoc lint unix-build unix-compile    unix-test
+ci: clean install compile
 
-unix-ci: clean unix-build unix-compile
+clean:
+       @echo "Cleaning..."
+       $(EASK) clean-all
 
-unix-build:
-       $(CASK) install
+install:
+       @echo "Installing..."
+       $(EASK) install
 
-unix-compile:
+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'



reply via email to

[Prev in Thread] Current Thread [Next in Thread]