iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: run bazel for package-builder via yarn rather than binary directly (#32983)

Browse Source 
PR Close #32983
This commit is contained in:
Joey Perrott 2019-10-08 12:14:24 -07:00 committed by Miško Hevery
parent af1f27e756
commit 5ede5b7807
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/package-builder.sh
View File

@ -17,16 +17,13 @@ cd "$(dirname "$0")"
# basedir is the workspace root # basedir is the workspace root
readonly base_dir=$(pwd)/.. readonly base_dir=$(pwd)/..
# We need to resolve the Bazel binary in the node modules because running Bazel readonly bazel_bin=$(yarn run -s bazel info bazel-bin)
# through `yarn bazel` causes additional output that throws off command stdout.
readonly bazel_bin=$(yarn bin)/bazel
readonly bin=$(${bazel_bin} info bazel-bin)
function buildTargetPackages() { function buildTargetPackages() {
# List of targets to build, e.g. core, common, compiler, etc. Note that we want to # List of targets to build, e.g. core, common, compiler, etc. Note that we want to
# remove all carriage return ("\r") characters form the query output because otherwise # remove all carriage return ("\r") characters form the query output because otherwise
# the carriage return is part of the bazel target name and bazel will complain. # the carriage return is part of the bazel target name and bazel will complain.
targets=$(${bazel_bin} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)' | tr -d "\r") targets=$(yarn run -s bazel query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)' | tr -d "\r")
# Path to the output directory into which we copy the npm packages. # Path to the output directory into which we copy the npm packages.
dest_path="$1" dest_path="$1"
@ -44,7 +41,7 @@ function buildTargetPackages() {
echo "##################################" echo "##################################"
# Use --config=release so that snapshot builds get published with embedded version info # Use --config=release so that snapshot builds get published with embedded version info
echo "$targets" | xargs ${bazel_bin} build --config=release --define=compile=${compile_mode} echo "$targets" | xargs yarn run -s bazel build --config=release --define=compile=${compile_mode}
[[ -d "${base_dir}/${dest_path}" ]] || mkdir -p ${base_dir}/${dest_path} [[ -d "${base_dir}/${dest_path}" ]] || mkdir -p ${base_dir}/${dest_path}
@ -52,7 +49,7 @@ function buildTargetPackages() {
for pkg in ${dirs}; do for pkg in ${dirs}; do
# Skip any that don't have an "npm_package" target # Skip any that don't have an "npm_package" target
src_dir="${bin}/packages/${pkg}/npm_package" src_dir="${bazel_bin}/packages/${pkg}/npm_package"
dest_dir="${base_dir}/${dest_path}/${pkg}" dest_dir="${base_dir}/${dest_path}/${pkg}"
if [[ -d ${src_dir} ]]; then if [[ -d ${src_dir} ]]; then
echo "# Copy artifacts to ${dest_dir}" echo "# Copy artifacts to ${dest_dir}"