Skip to content

Commit 983d485

Browse files
Merge remote-tracking branch 'origin/main' into alertzero/action-catalog
# Conflicts: # x-pack/solutions/security/plugins/alertzero/moon.yml # x-pack/solutions/security/plugins/alertzero/tsconfig.json
2 parents e1333af + 302cde6 commit 983d485

1,500 files changed

Lines changed: 41050 additions & 12284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/moon.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ tasks:
2323
# `.buildkite` tests read fixtures via process.cwd() expecting the repo root
2424
# (matching how the pipeline scripts run in CI), so jest must run from the
2525
# workspace root. Jest still scopes discovery to `.buildkite` because rootDir
26-
# defaults to the location of jest.config.js. We invoke `.buildkite`'s own jest
26+
# defaults to the location of jest.config.cjs. We invoke `.buildkite`'s own jest
2727
# binary (its isolated npm workspace), not the repo-root scripts/jest.
2828
jest:
2929
command: .buildkite/node_modules/.bin/jest
3030
args:
3131
- '--config'
32-
- .buildkite/jest.config.js
32+
- .buildkite/jest.config.cjs
3333
options:
3434
runFromWorkspaceRoot: true
3535
inputs:

0 commit comments

Comments
 (0)