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.

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

revert quicktype bump since for CI issue #17934

Merged
merged 7 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker/run_local_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ docker compose -f docker/development/docker-compose.yml down
if [[ $skipMaven == "false" ]]; then
if [[ $mode == "no-ui" ]]; then
echo "Maven Build - Skipping Tests and UI"
mvn -q -DskipTests -DonlyBackend clean package -pl !openmetadata-ui
mvn -DskipTests -DonlyBackend clean package -pl !openmetadata-ui
else
echo "Maven Build - Skipping Tests"
mvn -q -DskipTests clean package
mvn -DskipTests clean package
fi
else
echo "Skipping Maven Build"
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/json2ts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ getTypes(){
for file_with_dir in $(find $tmp_dir -name "*.json" | sed -e "s/${escaped_tmp_dir}//g")
do
joblist=$(jobs | wc -l)
while [ ${joblist} -ge 30 ]
while [ ${joblist} -ge 10 ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we are changing this?

do
sleep 1
joblist=$(jobs | wc -l)
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"scripts": {
"start": "NODE_ENV=development BABEL_ENV=development webpack serve --config ./webpack.config.dev.js --env development",
"build": "NODE_ENV=production BABEL_ENV=production webpack --config ./webpack.config.prod.js --env production",
"preinstall": "cd ../../../../.. && yarn install --frozen-lockfile",
"preinstall": "cd ../../../../.. && yarn global add node-gyp && yarn install --frozen-lockfile",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chirag-madlani , is this required?

"postinstall": "yarn run build-check",
"pre-commit": "lint-staged --concurrent false",
"test": "jest --passWithNoTests --maxWorkers=3 --silent",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
LabelType,
State,
TagSource,
TypeEnum,
} from '../generated/entity/services/databaseService';
import {
MessagingService,
Expand Down Expand Up @@ -80,7 +79,7 @@ export const MOCK_DATABASE_SERVICE: DatabaseService = {
hostPort: 'localhost:1234',
credentials: {
gcpConfig: {
type: TypeEnum.ServiceAccount,
type: 'service_account',
projectId: ['projectID'],
privateKeyId: 'privateKeyId',
privateKey: '*********',
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
"url": "https://github.com/open-metadata/OpenMetadata.git"
},
"devDependencies": {
"quicktype": "^23.0.170"
"quicktype": "^17.0.6",
"node-gyp": "^10.0.1"
},
"scripts": {
"preinstall": "yarn global add node-gyp",
"test": "echo \"Error: no test specified\" && exit 1"
}
}
}
Loading
Loading