Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Manual Backport][1.3]Enhance the Build and Test workflow #3314

Closed
wants to merge 1 commit into from
Closed

[Manual Backport][1.3]Enhance the Build and Test workflow #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
457 changes: 457 additions & 0 deletions .github/workflows/build_and_test_workflow.yml
View file
Open in desktop

Large diffs are not rendered by default.

306 changes: 0 additions & 306 deletions .github/workflows/pr_check_workflow.yml
View file
Open in desktop

This file was deleted.

18 changes: 13 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"built_assets",
".eslintcache",
".node_binaries",
"src/plugins/*/target"
"src/plugins/*/target",
"src/core/target",
"src/test_utils/target"
]
}
},
Expand All @@ -43,13 +45,16 @@
"test": "grunt test",
"test:bwc": "./scripts/bwctest_osd.sh",
"test:jest": "node scripts/jest",
"test:jest:coverage": "node scripts/jest --coverage",
"test:jest:ci": "node scripts/jest --ci --colors --runInBand",
"test:jest:ci:coverage": "node scripts/jest --ci --colors --runInBand --coverage",
"test:jest_integration": "node scripts/jest_integration",
"test:jest_integration:ci": "node scripts/jest_integration --ci --colors --max-old-space-size=5120",
"test:mocha": "node scripts/mocha",
"test:mocha:coverage": "grunt test:mochaCoverage",
"test:mocha:coverage": "yarn nyc --reporter=text-summary --reporter=lcov --report-dir=./target/opensearch-dashboards-coverage/mocha node scripts/mocha",
"test:ftr": "node scripts/functional_tests",
"test:ftr:server": "node scripts/functional_tests_server",
"test:ftr:runner": "node scripts/functional_test_runner",
"test:coverage": "grunt test:coverage",
"checkLicenses": "node scripts/check_licenses --dev",
"build-platform": "node scripts/build",
"build": "node scripts/build --all-platforms",
Expand Down Expand Up @@ -79,7 +84,8 @@
"**/@types/node": ">=10.17.17 <10.20.0",
"**/@types/react": "^16.14.23",
"**/ansi-regex": "^5.0.1",
"**/axios": "^0.21.4",
"!chromedriver/**/axios": "^0.21.4",
"chromedriver/**/axios": "^0.27.2",
"**/ejs": "^3.1.6",
"**/follow-redirects": "^1.15.2",
"**/front-matter": "^4.0.2",
Expand Down Expand Up @@ -107,6 +113,8 @@
"**/url-parse": "^1.5.8",
"**/shelljs": "0.8.5",
"**/unset-value": "^2.0.1",
"**/jest-config": "npm:@amoo-miki/jest-config@26.4.2-rc.1",
"**/jest-jasmine2": "npm:@amoo-miki/jest-jasmine2@26.4.2-rc.1",
"**/minimatch": "^3.0.5"
},
"workspaces": {
Expand Down Expand Up @@ -367,7 +375,7 @@
"chai": "3.5.0",
"chance": "1.0.18",
"cheerio": "0.22.0",
"chromedriver": "^91.0.1",
"chromedriver": "107.0.1",
"classnames": "2.2.6",
"compare-versions": "3.5.1",
"d3": "3.5.17",
Expand Down
6 changes: 4 additions & 2 deletions packages/osd-optimizer/src/worker/run_worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,13 @@ const exit = (code: number) => {
setTimeout(() => {
send(
workerMsgs.error(
new Error('process did not automatically exit within 5 seconds, forcing exit')
new Error(
`process did not automatically exit within 15 seconds (previous code: ${code}); forcing exit...`
)
)
);
process.exit(1);
}, 5000).unref();
}, 15000).unref();
};

// check for connected parent on an unref'd timer rather than listening
Expand Down
Loading