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
feat: hermetic build scripts to use a single output/generation folder #1987
Changes from all commits
0975267
4fd3973
c3e53fc
01c3343
a07b118
e153b00
5c7e51c
3d19e2e
9e87d8c
8b8f24f
22d3e0e
55c7d8c
05858ff
f8271b7
cc57e23
0b54240
0a8e78c
34b9e64
1eba2ed
5ed472b
496c742
0ebc098
80a449e
87b4e73
7fc632a
aa8a1e4
0504984
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,16 +12,26 @@ readonly REPLACE_SOURCE='false' | |
readonly PERFORM_CLEANUP='false' | ||
bash "${SCRIPT_DIR}/generate_components.sh" "${REPLACE_SOURCE}" "${PERFORM_CLEANUP}" | ||
|
||
# compare with proto library | ||
PROTO_PROJECT_DIR='proto-gapic-showcase-v1beta1' | ||
diff -ru "${SHOWCASE_DIR}/${PROTO_PROJECT_DIR}/src" "${SCRIPT_DIR}/showcase-output/proto-showcase-output/src" | ||
|
||
# compare with grpc library | ||
GRPC_PROJECT_DIR='grpc-gapic-showcase-v1beta1' | ||
diff -ru "${SHOWCASE_DIR}/${GRPC_PROJECT_DIR}/src/main/java/com" "${SCRIPT_DIR}/showcase-output/grpc-showcase-output/src/main/java/com" | ||
|
||
# compare with gapic library | ||
GAPIC_PROJECT_DIR='gapic-showcase' | ||
diff -ru "${SHOWCASE_DIR}/${GAPIC_PROJECT_DIR}/src/main/java" "${SCRIPT_DIR}/showcase-output/gapic-showcase-output/src/main/java" | ||
|
||
{ | ||
# compare with proto library | ||
(diff -ru "${SHOWCASE_DIR}/${PROTO_PROJECT_DIR}/src" "${SCRIPT_DIR}/output/showcase-output/proto-showcase-output/src") && | ||
|
||
# compare with grpc library | ||
(diff -ru "${SHOWCASE_DIR}/${GRPC_PROJECT_DIR}/src/main/java/com" "${SCRIPT_DIR}/output/showcase-output/grpc-showcase-output/src/main/java/com") && | ||
|
||
# compare with gapic library | ||
(diff -ru "${SHOWCASE_DIR}/${GAPIC_PROJECT_DIR}/src/main/java" "${SCRIPT_DIR}/output/showcase-output/gapic-showcase-output/src/main/java") | ||
} || { | ||
failure="true" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this logic correct? I see that showcase integration tests always exit with 1. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is correct, I found out why they were failing. It was because there was a Now |
||
} | ||
|
||
cleanup $SCRIPT_DIR | ||
|
||
if [ "${failure}" == "true" ]; then | ||
exit 1 | ||
fi | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think output_folder will be created by
generate_library.sh
, does it need to be created here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we need external repositories to be located in there as well, which is handled by
generate_showcase.sh
andgenerate_library_integration_test.sh
. I guess it would make more sense to rely on a function to prevent duplicationThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 0ebc098