From 9ee38b74363b3f8f40e126f6e5ec15db4d4341e9 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Thu, 5 Nov 2020 00:20:31 +0900 Subject: [PATCH 1/2] Fix the CI workflow. --- .github/workflows/CI.yml | 27 ++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d3f8df9a..22d3e16f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,9 +29,9 @@ jobs: name: Test strategy: matrix: - eslint: [7] - node: [14] - os: [ubuntu-latest] + eslint: [] + node: [] + os: [] include: # On other platforms - eslint: 7 @@ -77,6 +77,27 @@ jobs: run: npm run -s build - name: Test run: npm run -s test:mocha + + test-cov: + name: Test and Send Coverage + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Checkout submodules + run: git submodule update --init + - name: Install Node.js v14 + uses: actions/setup-node@v1 + with: + node-version: 14 + - name: Install Packages + run: npm install + - name: Install ESLint v7 + run: node scripts/ci-install-eslint 7 + - name: Build + run: npm run -s build + - name: Test + run: npm run -s test:mocha - name: Send Coverage run: npm run -s codecov env: diff --git a/package.json b/package.json index 87599abc..1a4d11a6 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "clean": "rimraf .nyc_output .temp coverage index.*", "codecov": "codecov", "coverage": "opener ./coverage/lcov-report/index.html", - "lint": "node -e \"if(process.env.ESLINT=='5')process.exit(1)\" && eslint src test --ext .js,.ts || node -e \"if(process.env.ESLINT!='5')process.exit(1)\"", + "lint": "eslint src test --ext .js,.ts", "setup": "git submodule update --init && cd test/fixtures/eslint && npm install", "pretest": "run-s build lint", "test": "npm run -s test:mocha", From 794c4e2be206e2aff3a83921c52becdab8d18b68 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Thu, 5 Nov 2020 00:21:49 +0900 Subject: [PATCH 2/2] fix --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 22d3e16f..91907760 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,9 +29,9 @@ jobs: name: Test strategy: matrix: - eslint: [] - node: [] - os: [] + eslint: [7] + node: [14] + os: [ubuntu-latest] include: # On other platforms - eslint: 7