Skip to content

Commit

Permalink
Merge pull request #45 from jcs-PR/ci/eask
Browse files Browse the repository at this point in the history
ci: Replace Cask with Eask
  • Loading branch information
psibi committed Sep 28, 2024
2 parents b6a75c7 + a81e606 commit 3e3257e
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 25 deletions.
24 changes: 17 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,40 @@ on:
pull_request:
workflow_dispatch:

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

jobs:
unix-test:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os:
- ubuntu-latest
# TODO: Test other OSs!
#- macos-latest
#- windows-latest
emacs-version:
- 27.2
- 28.1
- 29.3
- 28.2
- 29.4

steps:
- uses: actions/checkout@v4

- uses: taiki-e/install-action@v2
with:
tool: just@1.16.0
- uses: purcell/setup-emacs@master

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

- uses: cask/setup-cask@v1
- uses: emacs-eask/setup-eask@master
with:
version: 0.9.0
version: 'snapshot'

- name: Install requirements
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
*.elc
/.cask
/.eask
/dist
/config.mk
*autoloads.el
test/test-project/target
Expand Down
13 changes: 0 additions & 13 deletions Cask

This file was deleted.

26 changes: 26 additions & 0 deletions Eask
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
(package "rustic"
"3.5"
"Rust development environment")

(package-file "rustic.el")

(files "rustic-*.el")

(source 'gnu)
(source 'melpa)

(depends-on "rust-mode" "1.0.6")
(depends-on "dash")
(depends-on "f")
(depends-on "markdown-mode")
(depends-on "s")
(depends-on "spinner")
(depends-on "xterm-color")
(depends-on "flycheck")
(depends-on "project" "0.3.0")

(development
(depends-on "ert-runner")
(depends-on "lsp-mode"))

(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
10 changes: 5 additions & 5 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
just:
just --list --unsorted

# Install dependencies and build via cask
# Install dependencies and build via eask
build:
emacs --version
cask install
cask build
eask install-deps --dev
eask package

# Test
test:
cask emacs --batch -L . -L test -f batch-byte-compile $(cask files)
cask emacs --batch -L . -L test -l test/all-tests.el -f ert-run-tests-batch-and-exit
eask compile
eask emacs --batch -L . -L test -l test/all-tests.el -f ert-run-tests-batch-and-exit

0 comments on commit 3e3257e

Please sign in to comment.