Skip to content

Commit

Permalink
ci: Improve CI performance (no-changelog) (#7637)
Browse files Browse the repository at this point in the history
1. Split backend and frontend tests to avoid them running in parallel
2. Enable coverage only on `master`
  • Loading branch information
netroy authored Nov 7, 2023
1 parent f748de9 commit 2f66568
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 44 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:
with:
ref: ${{ inputs.branch }}
nodeVersion: ${{ matrix.node-version }}
cacheKey: ${{ github.sha }}-base:${{ matrix.node-version }}-test-lint
cacheKey: ${{ github.sha }}-base:${{ matrix.node-version }}-test-lint
collectCoverage: true

lint:
name: Lint changes
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/units-tests-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ on:
required: false
default: ''
type: string
collectCoverage:
required: false
default: 'false'
type: string

jobs:
unit-test:
name: Unit tests
runs-on: ubuntu-latest
env:
COVERAGE_ENABLED: ${{ inputs.collectCoverage }}
steps:
- uses: actions/checkout@v3.5.3
with:
Expand Down Expand Up @@ -51,10 +57,14 @@ jobs:
path: ./packages/**/dist
key: ${{ inputs.cacheKey }}

- name: Test
run: pnpm test
- name: Test Backend
run: pnpm test:backend

- name: Test Frontend
run: pnpm test:frontend

- name: Upload coverage to Codecov
if: ${{ inputs.collectCoverage == 'true' }}
uses: codecov/codecov-action@v3
with:
files: packages/@n8n/client-oauth2/coverage/cobertura-coverage.xml,packages/cli/coverage/cobertura-coverage.xml,packages/core/coverage/cobertura-coverage.xml,packages/design-system/coverage/cobertura-coverage.xml,packages/editor-ui/coverage/cobertura-coverage.xml,packages/nodes-base/coverage/cobertura-coverage.xml,packages/workflow/coverage/cobertura-coverage.xml
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const config = {
return acc;
}, {}),
setupFilesAfterEnv: ['jest-expect-message'],
collectCoverage: true,
collectCoverage: process.env.COVERAGE_ENABLED === 'true',
coverageReporters: [process.env.COVERAGE_REPORT === 'true' ? 'text' : 'text-summary'],
collectCoverageFrom: ['src/**/*.ts'],
};
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"scripts": {
"preinstall": "node scripts/block-npm-install.js",
"build": "turbo run build",
"build:backend": "pnpm --filter=!n8n-design-system --filter=!n8n-editor-ui build",
"build:frontend": "pnpm --filter=n8n-design-system --filter=n8n-editor-ui build",
"typecheck": "turbo run typecheck",
"dev": "turbo run dev --parallel",
"clean": "turbo run clean --parallel",
Expand All @@ -23,6 +25,8 @@
"start:tunnel": "./packages/cli/bin/n8n start --tunnel",
"start:windows": "cd packages/cli/bin && n8n",
"test": "turbo run test",
"test:backend": "pnpm --filter=!n8n-design-system --filter=!n8n-editor-ui test",
"test:frontend": "pnpm --filter=n8n-design-system --filter=n8n-editor-ui test",
"watch": "turbo run watch",
"webhook": "./packages/cli/bin/n8n webhook",
"worker": "./packages/cli/bin/n8n worker",
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"clean": "rimraf dist .turbo",
"build": "vite build",
"typecheck": "vue-tsc --declaration --emitDeclarationOnly",
"test": "vitest run --coverage",
"test": "vitest run",
"test:dev": "vitest",
"build:storybook": "storybook build",
"storybook": "storybook dev -p 6006",
Expand Down
41 changes: 23 additions & 18 deletions packages/design-system/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
import vue from '@vitejs/plugin-vue';
import { resolve } from 'path';
import { defineConfig, mergeConfig } from 'vite';
import { type UserConfig } from 'vitest';
import { defineConfig as defineVitestConfig } from 'vitest/config';

const { coverageReporters } = require('../../jest.config.js');
export const vitestConfig = defineVitestConfig({
test: {
globals: true,
environment: 'jsdom',
setupFiles: ['./src/__tests__/setup.ts'],
...(process.env.COVERAGE_ENABLED === 'true'
? {
coverage: {
provider: 'v8',
reporter: require('../../jest.config.js').coverageReporters,
all: true,
},
}
: {}),
css: {
modules: {
classNameStrategy: 'non-scoped',
},
},
},
}) as UserConfig;

export default mergeConfig(
defineConfig({
Expand Down Expand Up @@ -35,21 +56,5 @@ export default mergeConfig(
},
},
}),
defineVitestConfig({
test: {
globals: true,
environment: 'jsdom',
setupFiles: ['./src/__tests__/setup.ts'],
coverage: {
provider: 'v8',
reporter: coverageReporters,
all: true,
},
css: {
modules: {
classNameStrategy: 'non-scoped',
},
},
},
}),
vitestConfig,
);
2 changes: 1 addition & 1 deletion packages/editor-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lintfix": "eslint src --ext .js,.ts,.vue --fix",
"format": "prettier --write . --ignore-path ../../.prettierignore",
"serve": "cross-env VUE_APP_URL_BASE_API=http://localhost:5678/ vite --host 0.0.0.0 --port 8080 dev",
"test": "vitest run --coverage",
"test": "vitest run",
"test:dev": "vitest"
},
"dependencies": {
Expand Down
22 changes: 2 additions & 20 deletions packages/editor-ui/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import vue from '@vitejs/plugin-vue';
import { resolve } from 'path';
import { defineConfig, mergeConfig } from 'vite';
import { defineConfig as defineVitestConfig } from 'vitest/config';
import { sentryVitePlugin } from '@sentry/vite-plugin';

import packageJSON from './package.json';

const { coverageReporters } = require('../../jest.config.js');
import { vitestConfig } from '../design-system/vite.config';

const vendorChunks = ['vue', 'vue-router'];
const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
Expand Down Expand Up @@ -115,21 +113,5 @@ export default mergeConfig(
},
},
}),
defineVitestConfig({
test: {
globals: true,
environment: 'jsdom',
setupFiles: ['./src/__tests__/setup.ts'],
coverage: {
provider: 'v8',
reporter: coverageReporters,
all: true,
},
css: {
modules: {
classNameStrategy: 'non-scoped',
},
},
},
}),
vitestConfig,
);

0 comments on commit 2f66568

Please sign in to comment.