Skip to content

Commit fc92b95

Browse files
Replace Cask with Eldev
- Remove Makefile use Eldev to download Eglot test helpers. - Use Eldev in GH Actions
1 parent c7842fe commit fc92b95

File tree

4 files changed

+39
-63
lines changed

4 files changed

+39
-63
lines changed

.github/workflows/test.yml

+19-14
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,27 @@ jobs:
2626
with:
2727
dotnet-version: ${{ matrix.dotnet }}
2828
- uses: actions/checkout@v2
29-
- uses: conao3/setup-cask@master
29+
- name: Install Eldev
30+
run: curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/github-eldev | sh
3031
- name: Show dotnet sdks
3132
run: dotnet --list-sdks
3233
- name: Show dotnet version
3334
run: dotnet --info
3435
- name: Test
35-
run: make test
36+
run: |
37+
echo "Archives:"
38+
eldev archives
39+
echo "Dependencies:"
40+
eldev -v dependencies
41+
echo "Testing:"
42+
eldev -dtT test
3643
windows-build:
3744
runs-on: windows-latest
3845
strategy:
3946
fail-fast: false
4047
steps:
4148
- uses: actions/setup-dotnet@v1
42-
- name: Install Cask/scoop-emacs
49+
- name: Install scoop-emacs
4350
run: |
4451
Set-ExecutionPolicy RemoteSigned -scope CurrentUser
4552
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
@@ -49,15 +56,13 @@ jobs:
4956
scoop install make
5057
echo "$env:PATH" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
5158
- uses: actions/checkout@v2
52-
- name: Test # FIXME: cask hack
59+
- name: Install Eldev
60+
run: curl.exe -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev.bat | cmd /Q
61+
- name: Test
5362
run: |
54-
git clone https://github.com/tom-bowles/cask cask-windows
55-
Remove-Item -recurse .\cask-windows\test
56-
dotnet restore test/Test1
57-
Invoke-WebRequest -Uri https://raw.githubusercontent.com/joaotavora/eglot/master/eglot-tests.el -OutFile eglot-tests.el
58-
Start .\Cask-windows\bin\cask.bat -ArgumentList install -NoNewWindow -Wait
59-
Start .\Cask-windows\bin\cask.bat -ArgumentList build -NoNewWindow -Wait
60-
Start .\Cask-windows\bin\cask.bat -ArgumentList "exec buttercup -L . -L test --traceback full" -NoNewWindow -Wait
61-
62-
63-
63+
echo "Archives:"
64+
~/.local/bin/eldev.bat archives
65+
echo "Dependencies:"
66+
~/.local/bin/eldev.bat dependencies
67+
echo "Testing:"
68+
~/.local/bin/eldev.bat -p -dtT test

Cask

-9
This file was deleted.

Eldev

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
; -*- mode: emacs-lisp; lexical-binding: t -*-
2+
;; FIXME: Use if-modified-since header?
3+
(unless (and (file-exists-p "eglot-tests.el") (< (time-to-seconds (time-subtract (current-time)
4+
(file-attribute-modification-time (file-attributes "eglot-tests.el"))))
5+
86400))
6+
(url-copy-file "https://raw.githubusercontent.com/joaotavora/eglot/master/eglot-tests.el" "eglot-tests.el" t))
7+
8+
9+
(setq package-lint-main-file "eglot-fsharp.el")
10+
(setq eldev-project-main-file "eglot-fsharp.el")
11+
12+
(eldev-use-package-archive 'melpa-unstable)
13+
(eldev-use-package-archive 'gnu)
14+
(eldev-use-plugin 'autoloads)
15+
(setq package-archive-priorities
16+
'(("melpa-unstable" . 400)
17+
("gnu" . 300)))
18+
19+
20+

Makefile

-40
This file was deleted.

0 commit comments

Comments
 (0)