Skip to content

Commit 6918f3f

Browse files
authored
Merge pull request #154 from emacs-typescript/feature/build-tasks
Move build to use proper tasks
2 parents ab9c2e4 + 1c2a8b2 commit 6918f3f

File tree

2 files changed

+42
-10
lines changed

2 files changed

+42
-10
lines changed

.github/workflows/build.yml

+38-7
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,59 @@ on:
99
workflow_dispatch:
1010

1111
jobs:
12-
build:
13-
runs-on: ubuntu-20.04
14-
name: Emacs - ${{ matrix.emacs }}
12+
unix-build:
13+
runs-on: ${{ matrix.os }}
1514
strategy:
1615
matrix:
17-
emacs: [26.1, 26.2, 26.3, 27.1, snapshot]
16+
os: [ubuntu-latest, macos-latest]
17+
emacs: [26.1, 26.2, 26.3, 27.1, 27.2, snapshot]
1818

1919
steps:
2020
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2121
- uses: actions/checkout@v2
2222

23+
- uses: actions/setup-python@v2
24+
with:
25+
python-version: "3.6"
26+
architecture: "x64"
27+
2328
- uses: purcell/setup-emacs@master
2429
with:
2530
version: ${{ matrix.emacs }}
2631

32+
- uses: conao3/setup-cask@master
33+
with:
34+
version: 0.8.4
35+
2736
- name: paths
2837
run: |
2938
echo "$HOME/.cask/bin" >> $GITHUB_PATH
30-
- name: Install cask
39+
- name: Run a multi-line script
3140
run: |
32-
curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
33-
cask
41+
emacs --version
42+
make test
43+
windows-build:
44+
runs-on: windows-latest
45+
strategy:
46+
matrix:
47+
emacs: [26.1, 26.2, 26.3, 27.1, 27.2, snapshot]
48+
49+
steps:
50+
- uses: actions/checkout@v2
51+
52+
- uses: actions/setup-python@v2
53+
with:
54+
python-version: "3.6"
55+
architecture: "x64"
56+
57+
- uses: jcs090218/setup-emacs-windows@master
58+
with:
59+
version: ${{ matrix.emacs }}
60+
61+
- uses: conao3/setup-cask@master
62+
with:
63+
version: 0.8.4
64+
3465
- name: Run a multi-line script
3566
run: |
3667
emacs --version

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
EMACS=$(shell which emacs) -Q -batch -L .
1+
EMACS ?= emacs
2+
CASK ?= cask
23
ELS = \
34
typescript-mode.el \
45
typescript-mode-test-utilities.el \
@@ -11,9 +12,9 @@ clean:
1112
rm -f $(ELCS)
1213

1314
cask: clean
14-
cask build
15+
$(CASK) build
1516

1617
test: cask
17-
+ $(EMACS) -l typescript-mode-tests.el -f ert-run-tests-batch-and-exit
18+
+ $(EMACS) -Q -batch -L . -l typescript-mode-tests.el -f ert-run-tests-batch-and-exit
1819

1920
# end

0 commit comments

Comments
 (0)