From 248674b69807dd2b989387aed5c6b1f598e5ab94 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Fri, 15 Apr 2022 22:47:58 +0800 Subject: [PATCH 1/5] Replace Cask with Eask --- .github/workflows/build.yml | 56 +++++++++++-------------------------- .gitignore | 4 +-- Cask | 4 --- Eask | 14 ++++++++++ Makefile | 8 +++--- 5 files changed, 37 insertions(+), 49 deletions(-) delete mode 100644 Cask create mode 100644 Eask diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad9e871..e2d5569 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,9 +14,9 @@ jobs: 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: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1] include: - emacs: snapshot experimental: true @@ -24,56 +24,34 @@ jobs: - emacs: snapshot experimental: true os: macos-latest + - emacs: 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: '14' + + - 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 d54dbd5..de750ec 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 f919bdc..0000000 --- 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 0000000..7f6aef4 --- /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 ea7a2ea..d48eb76 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 From 85841136f98f3b2fe8389874e0eee94033954303 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Fri, 15 Apr 2022 22:52:36 +0800 Subject: [PATCH 2/5] fix defined emacs version --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d5569..e0abacc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,14 +9,14 @@ on: workflow_dispatch: jobs: - unix-build: + build: runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] experimental: [false] - emacs: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1] + emacs_version: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1] include: - emacs: snapshot experimental: true From 6654f7bfb0629c3fbd8d602a9f502fde8cc5e647 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Fri, 15 Apr 2022 22:53:58 +0800 Subject: [PATCH 3/5] fix defined emacs version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0abacc..92ee744 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] experimental: [false] - emacs_version: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1] + emacs-version: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1] include: - emacs: snapshot experimental: true From bbac33757917d87b1da698baa2185feb118343e5 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Fri, 15 Apr 2022 22:57:41 +0800 Subject: [PATCH 4/5] ci: fix emacs version syntax --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92ee744..4bc2de4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,13 +18,13 @@ jobs: experimental: [false] 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: snapshot + - emacs-version: snapshot experimental: true os: windows-latest continue-on-error: ${{ matrix.experimental }} From e1a578f1ff9665e2a3766700565e1a1b63bb59fd Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Wed, 20 Apr 2022 21:56:39 +0800 Subject: [PATCH 5/5] Bump node version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bc2de4..afb7efd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: '14' + node-version: '16' - uses: emacs-eask/setup-eask@master with: