Skip to content

Commit b6a9c74

Browse files
committed
feat: Improvements
1 parent 45fcbf1 commit b6a9c74

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

scripts/download-oas.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
# Move oas to root level
3434
mkdir ${ROOT_DIR}/oas
3535
cd ${work_dir}
36-
git clone ${OAS_REPO}
36+
git clone ${OAS_REPO} --quiet
3737

3838
for service_dir in ${work_dir}/${OAS_REPO_NAME}/services/*; do
3939
max_version_dir=""

scripts/generate-sdk/generate-sdk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,21 @@ fi
7474
# Generate SDK for the specified language
7575
case "${LANGUAGE}" in
7676
go)
77-
echo -e "\nGenerating the Go SDK...\n"
77+
echo -e "\n>> Generating the Go SDK...\n"
7878

7979
source ${LANGUAGE_GENERATORS_FOLDER_PATH}/${LANGUAGE}.sh
8080
# Usage: generate_go_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
8181
generate_go_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
8282
;;
8383
python)
84-
echo -e "\nGenerating the Python SDK...\n"
84+
echo -e "\n>> Generating the Python SDK...\n"
8585

8686
source ${LANGUAGE_GENERATORS_FOLDER_PATH}/${LANGUAGE}.sh
8787
# Usage: generate_python_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
8888
generate_python_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
8989
;;
9090
*)
91-
echo "SDK language not supported."
91+
echo "! SDK language not supported."
9292
exit 1
9393
;;
9494
esac

scripts/generate-sdk/languages/go.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,5 +215,4 @@ generate_go_sdk() {
215215
cd ${SDK_REPO_LOCAL_PATH}
216216
goimports -w ${SERVICES_FOLDER}/
217217
make sync-tidy
218-
219218
}

scripts/sdk-create-pr.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if [[ ! ${work_dir} || -d {work_dir} ]]; then
4848
fi
4949

5050
# Delete temp directory on exit
51-
trap "rm -rf ${work_dir}" EXIT
51+
# trap "rm -rf ${work_dir}" EXIT
5252

5353
mkdir ${work_dir}/git_repo # Where the git repo will be created
5454
mkdir ${work_dir}/sdk_backup # Backup of the SDK to check for new modules
@@ -60,7 +60,7 @@ rm -rf ${work_dir}/sdk_to_push/.git
6060

6161
# Initialize git repo
6262
cd ${work_dir}/git_repo
63-
git clone ${REPO_URL_SSH} ./
63+
git clone ${REPO_URL_SSH} ./ --quiet
6464
git config user.name "${COMMIT_NAME}"
6565
git config user.email "${COMMIT_EMAIL}"
6666

@@ -108,16 +108,18 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
108108

109109
# If lint or test fails for a service, we skip it and continue to the next one
110110
make lint skip-non-generated-files=true service=$service || {
111-
echo "! Linting failed for $service"
111+
echo "! Linting failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
112112
continue
113113
}
114-
make test skip-non-generated-files=true service=$service || {
115-
echo "! Testing failed for $service"
114+
go test ./services/${service} -timeout=5m -cover -count=1 || {
115+
echo "! Testing failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
116116
continue
117117
}
118118

119-
git commit -m "Generate $service: $COMMIT_INFO"
120-
git push origin "$branch"
119+
echo ">> Actually pushing changes to main for $service service..."
120+
echo ">> git diff for service $service: $(git status --porcelain "services/$service")"
121+
# git commit -m "Generate $service: $COMMIT_INFO"
122+
# git push origin "$branch"
121123
fi
122124
fi
123125
done

0 commit comments

Comments
 (0)