Merge pull request #168 from vim-denops/fix-ci

☕ Fix CI

Author: lambdalisue

.github/workflows/test.yml

@@ -1,20 +1,11 @@
 name: Test
 
-env:
-  DENOPS_PATH: "../denops.vim"
-  DENO_DIR: ".deno"
-
 on:
   schedule:
     - cron: "0 7 * * 0"
   push:
     branches:
       - main
-    paths:
-      - "**.md"
-      - "**.ts"
-      - ".github/workflows/test.yml"
-      - "Makefile"
   pull_request:
     paths:
       - "**.md"
@@ -43,17 +34,12 @@ jobs:
       - uses: denoland/setup-deno@v1
         with:
           deno-version: "${{ matrix.version }}"
-      - uses: actions/cache@v3
-        with:
-          path: ${{ env.DENO_DIR }}
-          key: ${{ runner.os }}-deno-${{ matrix.version }}-${{ hashFiles('**/*.ts') }}
-          restore-keys: |
-            ${{ runner.os }}-deno-${{ matrix.version }}-
-            ${{ runner.os }}-deno-
       - name: Lint check
         run: make lint
+        if: matrix.version == '1.x'
       - name: Format check
         run: make fmt-check
+        if: matrix.version == '1.x'
       - name: Type check
         run: make type-check
 
@@ -85,14 +71,6 @@ jobs:
       - uses: denoland/setup-deno@v1
         with:
           deno-version: "${{ matrix.version }}"
-      - uses: actions/cache@v3
-        id: cache
-        with:
-          path: ${{ env.DENO_DIR }}
-          key: ${{ runner.os }}-deno-${{ matrix.version }}-${{ hashFiles('**/*.ts') }}
-          restore-keys: |
-            ${{ runner.os }}-deno-${{ matrix.version }}-
-            ${{ runner.os }}-deno-
       - uses: thinca/action-setup-vim@v1
         id: vim
         with:
@@ -117,10 +95,10 @@ jobs:
         env:
           DENOPS_TEST_NVIM: ${{ steps.nvim.outputs.executable_path }}
       - name: Test
-        working-directory: ./repo
         run: make test
         env:
-          DENO_DIR: ../.deno
+          DENOPS_PATH: "../denops.vim"
           DENOPS_TEST_VIM: ${{ steps.vim.outputs.executable_path }}
           DENOPS_TEST_NVIM: ${{ steps.nvim.outputs.executable_path }}
         timeout-minutes: 10
+        working-directory: ./repo

Makefile

@@ -1,4 +1,4 @@
-TARGETS := $$(find . \( -name '*.ts' -or -name '*.md' \) -not -path './.deno/*')
+TARGETS := $$(find . -name '*.ts' -or -name '*.md')
 
 .DEFAULT_GOAL := help
 
@@ -8,13 +8,13 @@ help:
 	    perl -pe 's/(.*):.*##\s*/sprintf("%-20s",$$1)/eg;'
 
 fmt: FORCE	## Format code
-	@deno fmt --config deno.jsonc
+	@deno fmt
 
 fmt-check: FORCE	## Format check
-	@deno fmt --check --config deno.jsonc
+	@deno fmt --check
 
 lint: FORCE	## Lint code
-	@deno lint --config deno.jsonc
+	@deno lint
 
 type-check: FORCE	## Type check
 	@deno test --unstable --no-run ${TARGETS}

deno.jsonc

@@ -2,7 +2,7 @@ import {
   assertEquals,
   assertRejects,
 } from "https://deno.land/[email protected]/testing/asserts.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import * as anonymous from "./mod.ts";
 
 test({

denops_std/anonymous/mod_test.ts

@@ -1,5 +1,5 @@
 import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import { globals } from "../variable/mod.ts";
 import { define, emit, emitAll, list, remove } from "./common.ts";
 

denops_std/autocmd/common_test.ts

@@ -1,5 +1,5 @@
 import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import { globals } from "../variable/mod.ts";
 import { group } from "./group.ts";
 

denops_std/autocmd/group_test.ts

@@ -4,7 +4,7 @@ import {
   assertSpyCalls,
   spy,
 } from "https://deno.land/[email protected]/testing/mock.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import { batch, BatchHelper } from "./batch.ts";
 
 test({

denops_std/batch/batch_test.ts

@@ -2,7 +2,7 @@ import {
   assertEquals,
   assertRejects,
 } from "https://deno.land/[email protected]/testing/asserts.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import { gather, GatherHelper } from "./gather.ts";
 
 test({

denops_std/batch/gather_test.ts

@@ -1,6 +1,6 @@
 import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
 import { assertNumber } from "https://deno.land/x/[email protected]/mod.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import * as cursor from "./cursor.ts";
 import { assertPosition, assertScreenPos, isScreenPos } from "./types.ts";
 

denops_std/function/cursor_test.ts

@@ -2,7 +2,7 @@ import {
   assertEquals,
   assertRejects,
 } from "https://deno.land/[email protected]/testing/asserts.ts";
-import { test } from "https://deno.land/x/[email protected]/test/mod.ts";
+import { test } from "../test/mod.ts";
 import { input, inputlist, inputsecret } from "./input.ts";
 import * as autocmd from "../autocmd/mod.ts";
 import { execute } from "../helper/execute.ts";