[nongnu] elpa/typescript-mode 6918f3f6d7 212/222: Merge pull request #154 from emacs-typescript/feature/build-tasks

[ELPA Syncer]

branch: elpa/typescript-mode
commit 6918f3f6d72f5ea331a7e88ef9de0472919d3c1b
Merge: ab9c2e4fd0 1c2a8b2391
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: GitHub <noreply@github.com>

    Merge pull request #154 from emacs-typescript/feature/build-tasks
    
    Move build to use proper tasks
---
 .github/workflows/build.yml | 45 ++++++++++++++++++++++++++++++++++++++-------
 Makefile                    |  7 ++++---
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bddeccc8cd..3679f45f70 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,28 +9,59 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
-    name: Emacs - ${{ matrix.emacs }}
+  unix-build:
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        emacs: [26.1, 26.2, 26.3, 27.1, snapshot]
+        os: [ubuntu-latest, macos-latest]
+        emacs: [26.1, 26.2, 26.3, 27.1, 27.2, snapshot]
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can 
access it
       - uses: actions/checkout@v2
 
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.6"
+          architecture: "x64"
+
       - uses: purcell/setup-emacs@master
         with:
           version: ${{ matrix.emacs }}
 
+      - uses: conao3/setup-cask@master
+        with:
+          version: 0.8.4
+
       - name: paths
         run: |
           echo "$HOME/.cask/bin" >> $GITHUB_PATH
-      - name: Install cask
+      - name: Run a multi-line script
         run: |
-          curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | 
python
-          cask
+          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
diff --git a/Makefile b/Makefile
index 35eda6a12b..ea7a2ea227 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-EMACS=$(shell which emacs) -Q -batch -L .
+EMACS ?= emacs
+CASK ?= cask
 ELS = \
   typescript-mode.el \
   typescript-mode-test-utilities.el \
@@ -11,9 +12,9 @@ clean:
        rm -f $(ELCS)
 
 cask: clean
-       cask build
+       $(CASK) build
 
 test: cask
-       + $(EMACS) -l typescript-mode-tests.el -f ert-run-tests-batch-and-exit
+       + $(EMACS) -Q -batch -L . -l typescript-mode-tests.el -f 
ert-run-tests-batch-and-exit
 
 # end