Skip to content

Fix CI test #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 20 additions & 42 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ tramp
# AUCTeX auto folder
/auto/

# cask packages
.cask/
# eask packages
.eask/
dist/

# Flycheck
Expand Down
4 changes: 0 additions & 4 deletions Cask

This file was deleted.

14 changes: 14 additions & 0 deletions Eask
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
EMACS ?= emacs
CASK ?= cask
EASK ?= eask
ELS = \
typescript-mode.el \
typescript-mode-test-utilities.el \
Expand All @@ -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