From f5a7bcfa9562a0fd684d94f4810d272156910526 Mon Sep 17 00:00:00 2001 From: gaoyuan Date: Tue, 21 Nov 2023 12:01:32 +0800 Subject: [PATCH 1/2] fix(rspack-provider): rspack pretty time (#4976) --- .../builder/builder-rspack-provider/src/core/createCompiler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/builder-rspack-provider/src/core/createCompiler.ts b/packages/builder/builder-rspack-provider/src/core/createCompiler.ts index d5daa7494861..d48a3678190b 100644 --- a/packages/builder/builder-rspack-provider/src/core/createCompiler.ts +++ b/packages/builder/builder-rspack-provider/src/core/createCompiler.ts @@ -38,7 +38,7 @@ export async function createCompiler({ const printTime = (c: typeof obj, index: number) => { if (c.time) { - const time = prettyTime(c.time / 1000); + const time = prettyTime([0, c.time * 10 ** 6]); const target = Array.isArray(context.target) ? context.target[index] : context.target; From de43069d44e6de63632bbabb42ea37117c44dc0e Mon Sep 17 00:00:00 2001 From: Asuka109 Date: Tue, 21 Nov 2023 12:16:47 +0800 Subject: [PATCH 2/2] build: enable ci checks for dev branches (#4977) --- .github/workflows/test-Windows.yml | 2 +- .github/workflows/test-macOS.yml | 2 +- .github/workflows/test-module-Linux.yml | 2 +- .github/workflows/test-module-Windows.yml | 2 +- .github/workflows/type-check.yml | 2 +- .github/workflows/vitest-Windows.yml | 2 +- .github/workflows/vitest-macOS.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-Windows.yml b/.github/workflows/test-Windows.yml index 98b29f4c2b57..069a5ff5c778 100644 --- a/.github/workflows/test-Windows.yml +++ b/.github/workflows/test-Windows.yml @@ -8,7 +8,7 @@ concurrency: on: # Triggers the workflow on pull request events but only for the main branch pull_request: - branches: [main] + branches: [main, dev/**] merge_group: diff --git a/.github/workflows/test-macOS.yml b/.github/workflows/test-macOS.yml index 653e35528c84..ea9a8689c708 100644 --- a/.github/workflows/test-macOS.yml +++ b/.github/workflows/test-macOS.yml @@ -8,7 +8,7 @@ concurrency: on: # Triggers the workflow on pull request events but only for the main branch pull_request: - branches: [main] + branches: [main, dev/**] merge_group: diff --git a/.github/workflows/test-module-Linux.yml b/.github/workflows/test-module-Linux.yml index 6284bdb4aa48..49ae593118ca 100644 --- a/.github/workflows/test-module-Linux.yml +++ b/.github/workflows/test-module-Linux.yml @@ -2,7 +2,7 @@ name: Module Tools Test (Linux) on: push: - branches: [main] + branches: [main, dev/**] workflow_dispatch: diff --git a/.github/workflows/test-module-Windows.yml b/.github/workflows/test-module-Windows.yml index cbc4d96a755f..b604f57de19c 100644 --- a/.github/workflows/test-module-Windows.yml +++ b/.github/workflows/test-module-Windows.yml @@ -4,7 +4,7 @@ name: Module Tools Test (Windows) on: # Triggers the workflow on pull request events but only for the main branch push: - branches: [main] + branches: [main, dev/**] merge_group: diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml index 2ab03e039032..8ec0aff357a6 100644 --- a/.github/workflows/type-check.yml +++ b/.github/workflows/type-check.yml @@ -2,7 +2,7 @@ name: Type Check on: pull_request: - branches: [main] + branches: [main, dev/**] merge_group: diff --git a/.github/workflows/vitest-Windows.yml b/.github/workflows/vitest-Windows.yml index f08c77bf8b33..9c19b593bd1f 100644 --- a/.github/workflows/vitest-Windows.yml +++ b/.github/workflows/vitest-Windows.yml @@ -8,7 +8,7 @@ concurrency: on: # Triggers the workflow on pull request events but only for the main branch pull_request: - branches: [main] + branches: [main, dev/**] merge_group: diff --git a/.github/workflows/vitest-macOS.yml b/.github/workflows/vitest-macOS.yml index 0124c2afa8f9..5c64d0937e46 100644 --- a/.github/workflows/vitest-macOS.yml +++ b/.github/workflows/vitest-macOS.yml @@ -8,7 +8,7 @@ concurrency: on: # Triggers the workflow on pull request events but only for the main branch pull_request: - branches: [main] + branches: [main, dev/**] merge_group: