From 94b131b006001c0adfee5234b8654087176b307e Mon Sep 17 00:00:00 2001 From: shortstacked Date: Wed, 26 Mar 2025 11:24:53 +0000 Subject: [PATCH 1/2] ci: Timing test for blacksmith in e2e (no-changelog) (#14181) --- .github/workflows/e2e-reusable.yml | 10 +++++----- .github/workflows/units-tests-reusable.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml index c8247051a0e..84fb6f1665a 100644 --- a/.github/workflows/e2e-reusable.yml +++ b/.github/workflows/e2e-reusable.yml @@ -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 diff --git a/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml index fbb071900ad..3c1ae989833 100644 --- a/.github/workflows/units-tests-reusable.yml +++ b/.github/workflows/units-tests-reusable.yml @@ -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 }} From c9b806d30bd9614c6b8acaa7e36f6cedaff98fa5 Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Wed, 26 Mar 2025 13:35:19 +0200 Subject: [PATCH 2/2] fix: Check if tsconfig paths exists in jest config (no-changelog) (#14182) --- jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index e0892381419..d85107ac831 100644 --- a/jest.config.js +++ b/jest.config.js @@ -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: `${compilerOptions.baseUrl ? `/${compilerOptions.baseUrl.replace(/^\.\//, '')}` : ''}` }), + moduleNameMapper: compilerOptions?.paths ? pathsToModuleNameMapper(compilerOptions.paths, { prefix: `${compilerOptions.baseUrl ? `/${compilerOptions.baseUrl.replace(/^\.\//, '')}` : ''}` }) : {}, setupFilesAfterEnv: ['jest-expect-message'], collectCoverage: isCoverageEnabled, coverageReporters: ['text-summary', 'lcov', 'html-spa'],