branch: elpa/typescript-mode
commit 694a168492781587a4cd6f51e4c835de7c84ae24
Merge: 88f317f0b6 e1a578f1ff
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: GitHub <nore...@github.com>
Merge pull request #162 from jcs-PR/ci
Fix CI test
---
.github/workflows/build.yml | 62 +++++++++++++++------------------------------
.gitignore | 4 +--
Cask | 4 ---
Eask | 14 ++++++++++
Makefile | 8 +++---
5 files changed, 40 insertions(+), 52 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad9e8714c5..afb7efd2a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,71 +9,49 @@ on:
workflow_dispatch:
jobs:
- unix-build:
+ build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest, macos-latest]
+ os: [ubuntu-latest, macos-latest, windows-latest]
experimental: [false]
- emacs: [26.1, 26.2, 26.3, 27.1, 27.2]
+ emacs-version: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1]
include:
- - emacs: snapshot
+ - emacs-version: snapshot
experimental: true
os: ubuntu-latest
- - emacs: snapshot
+ - emacs-version: snapshot
experimental: true
os: macos-latest
+ - emacs-version: snapshot
+ experimental: true
+ os: windows-latest
continue-on-error: ${{ matrix.experimental }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can
access it
- uses: actions/checkout@v2
- - uses: actions/setup-python@v2
+ - uses: purcell/setup-emacs@master
+ if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
with:
- python-version: "3.6"
- architecture: "x64"
+ version: ${{ matrix.emacs-version }}
- - uses: purcell/setup-emacs@master
+ - uses: jcs090218/setup-emacs-windows@master
+ if: matrix.os == 'windows-latest'
with:
- version: ${{ matrix.emacs }}
+ version: ${{ matrix.emacs-version }}
- - uses: conao3/setup-cask@master
+ - uses: actions/setup-node@v2
with:
- version: 0.8.4
+ node-version: '16'
+
+ - uses: emacs-eask/setup-eask@master
+ with:
+ version: 'snapshot'
- - name: paths
- run: |
- echo "$HOME/.cask/bin" >> $GITHUB_PATH
- name: Run a multi-line script
run: |
emacs --version
make test
-
- # windows-build:
- # runs-on: windows-latest
- # strategy:
- # matrix:
- # emacs: [26.1, 26.2, 26.3, 27.1, 27.2, snapshot]
-
- # steps:
- # - uses: actions/checkout@v2
-
- # - uses: actions/setup-python@v2
- # with:
- # python-version: "3.6"
- # architecture: "x64"
-
- # - uses: jcs090218/setup-emacs-windows@master
- # with:
- # version: ${{ matrix.emacs }}
-
- # - uses: conao3/setup-cask@master
- # with:
- # version: 0.8.4
-
- # - name: Run a multi-line script
- # run: |
- # emacs --version
- # make test
diff --git a/.gitignore b/.gitignore
index d54dbd59d7..de750ec5d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,8 @@ tramp
# AUCTeX auto folder
/auto/
-# cask packages
-.cask/
+# eask packages
+.eask/
dist/
# Flycheck
diff --git a/Cask b/Cask
deleted file mode 100644
index f919bdc749..0000000000
--- a/Cask
+++ /dev/null
@@ -1,4 +0,0 @@
-(source gnu)
-(source melpa)
-
-(package-file "typescript-mode.el")
diff --git a/Eask b/Eask
new file mode 100644
index 0000000000..7f6aef4835
--- /dev/null
+++ b/Eask
@@ -0,0 +1,14 @@
+(package "typescript-mode"
+ "0.4"
+ "Major mode for editing typescript")
+
+(package-file "typescript-mode.el")
+
+(files "*.el")
+
+(source "gnu")
+(source "melpa")
+
+(depends-on "emacs" "24.3")
+
+(setq network-security-level 'low) ; see
https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
diff --git a/Makefile b/Makefile
index ea7a2ea227..d48eb7682e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
EMACS ?= emacs
-CASK ?= cask
+EASK ?= eask
ELS = \
typescript-mode.el \
typescript-mode-test-utilities.el \
@@ -11,10 +11,10 @@ ELCS = $(ELS:.el=.elc)
clean:
rm -f $(ELCS)
-cask: clean
- $(CASK) build
+eask: clean
+ $(EASK) build
-test: cask
+test: eask
+ $(EMACS) -Q -batch -L . -l typescript-mode-tests.el -f
ert-run-tests-batch-and-exit
# end
