diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd25276..8eeff6e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: | diff --git a/.gitignore b/.gitignore index f062b08..8b51124 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.elc /.cask +/.eask +/dist /config.mk *autoloads.el test/test-project/target diff --git a/Cask b/Cask deleted file mode 100644 index cd3fe0f..0000000 --- a/Cask +++ /dev/null @@ -1,13 +0,0 @@ -(source gnu) -(source melpa) - -(package-file "rustic.el") - -(development - (depends-on "rust-mode" "1.0.2") - (depends-on "spinner") - (depends-on "ert-runner") - (depends-on "lsp-mode") - (depends-on "flycheck") - (depends-on "f") - (depends-on "project" "0.3.0")) diff --git a/Eask b/Eask new file mode 100644 index 0000000..29567c6 --- /dev/null +++ b/Eask @@ -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 diff --git a/justfile b/justfile index 91d0271..fca8719 100644 --- a/justfile +++ b/justfile @@ -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