mirror of
https://github.com/n8n-io/n8n.git
synced 2026-06-05 02:59:27 +02:00
Merge remote-tracking branch 'origin/master' into ADO-3304
This commit is contained in:
commit
2e197f0856
10
.github/workflows/e2e-reusable.yml
vendored
10
.github/workflows/e2e-reusable.yml
vendored
|
|
@ -83,13 +83,13 @@ jobs:
|
|||
|
||||
- name: Cache build artifacts
|
||||
id: cache-build-artifacts
|
||||
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
|
||||
uses: useblacksmith/cache@c5fe29eb0efdf1cf4186b9f7fcbbcbc0cf025662 # v5
|
||||
with:
|
||||
path: |
|
||||
/home/runner/.cache/Cypress
|
||||
/github/home/.pnpm-store
|
||||
./packages/**/dist
|
||||
key: ${{ github.sha }}:build-artifacts
|
||||
key: ${{ github.sha }}-base:build
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.cache-build-artifacts.outputs.cache-hit != 'true'
|
||||
|
|
@ -111,7 +111,7 @@ jobs:
|
|||
|
||||
|
||||
testing:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: blacksmith-2vcpu-ubuntu-2204
|
||||
needs: ['prepare', 'install']
|
||||
strategy:
|
||||
fail-fast: false
|
||||
|
|
@ -134,13 +134,13 @@ jobs:
|
|||
|
||||
- name: Restore cached pnpm modules
|
||||
id: cache-build-artifacts
|
||||
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
|
||||
uses: useblacksmith/cache@c5fe29eb0efdf1cf4186b9f7fcbbcbc0cf025662 # v5
|
||||
with:
|
||||
path: |
|
||||
/home/runner/.cache/Cypress
|
||||
/github/home/.pnpm-store
|
||||
./packages/**/dist
|
||||
key: ${{ github.sha }}:build-artifacts
|
||||
key: ${{ github.sha }}-base:build
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
|
|
|
|||
2
.github/workflows/units-tests-reusable.yml
vendored
2
.github/workflows/units-tests-reusable.yml
vendored
|
|
@ -38,7 +38,7 @@ on:
|
|||
jobs:
|
||||
unit-test:
|
||||
name: Unit tests
|
||||
runs-on: blacksmith-2vcpu-ubuntu-2204
|
||||
runs-on: blacksmith-4vcpu-ubuntu-2204
|
||||
env:
|
||||
TURBO_FORCE: ${{ inputs.ignoreTurboCache }}
|
||||
COVERAGE_ENABLED: ${{ inputs.collectCoverage }}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ const config = {
|
|||
'^.+\\.ts$': ['ts-jest', tsJestOptions],
|
||||
},
|
||||
// This resolve the path mappings from the tsconfig relative to each jest.config.js
|
||||
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: `<rootDir>${compilerOptions.baseUrl ? `/${compilerOptions.baseUrl.replace(/^\.\//, '')}` : ''}` }),
|
||||
moduleNameMapper: compilerOptions?.paths ? pathsToModuleNameMapper(compilerOptions.paths, { prefix: `<rootDir>${compilerOptions.baseUrl ? `/${compilerOptions.baseUrl.replace(/^\.\//, '')}` : ''}` }) : {},
|
||||
setupFilesAfterEnv: ['jest-expect-message'],
|
||||
collectCoverage: isCoverageEnabled,
|
||||
coverageReporters: ['text-summary', 'lcov', 'html-spa'],
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user