Skip to content

Commit

Permalink
Merge branch 'main' into feat/devtools-proxy-service
Browse files Browse the repository at this point in the history
  • Loading branch information
Asuka109 committed Nov 21, 2023
2 parents c8ee6c0 + de43069 commit b999e9f
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-module-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Module Tools Test (Linux)

on:
push:
branches: [main]
branches: [main, dev/**]

workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-module-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/type-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Type Check

on:
pull_request:
branches: [main]
branches: [main, dev/**]

merge_group:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vitest-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vitest-macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b999e9f

Please sign in to comment.