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

Revert "build: package-build & release scripts should handle new pkg_npm naming (#34589)" (#34730)

Browse Source 
This reverts commit 053b23d902afc356d50f813bd1e3ab6b606554a6.

PR Close #34730
This commit is contained in:
atscott 2020-01-10 13:40:01 -08:00
parent 7eddbe5d7f
commit 7e9ac7650b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package-builder.js
View File

@ -61,7 +61,7 @@ function buildTargetPackages(destPath, enableIvy, description) {
// all carriage return (`\r`) characters form the query output, because otherwise the carriage // 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. // return is part of the bazel target name and bazel will complain.
const getTargetsCmd = const getTargetsCmd =
`${bazelCmd} query --output=label "attr('tags', '\\[.*release-with-framework.*\\]', //packages/...) intersect kind('ng_package|pkg_npm', //packages/...)"`; `${bazelCmd} query --output=label "attr('tags', '\\[.*release-with-framework.*\\]', //packages/...) intersect kind('.*_package', //packages/...)"`;
const targets = exec(getTargetsCmd, true).split(/\r?\n/); const targets = exec(getTargetsCmd, true).split(/\r?\n/);
// 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.

2
scripts/release/publish-latest
View File

@ -14,7 +14,7 @@ BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-latest.XXXXXXX)
BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE" BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE"
# query for all npm packages to be released as part of the framework release # query for all npm packages to be released as part of the framework release
NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind("ng_package|pkg_npm", //packages/...)'` NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
# build all npm packages in parallel # build all npm packages in parallel
$BAZEL build --config=release $NPM_PACKAGE_LABELS $BAZEL build --config=release $NPM_PACKAGE_LABELS
# publish all packages in sequence to make it easier to spot any errors or warnings # publish all packages in sequence to make it easier to spot any errors or warnings

2
scripts/release/publish-next
View File

@ -14,7 +14,7 @@ BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-next.XXXXXXX)
BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE" BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE"
# query for all npm packages to be released as part of the framework release # query for all npm packages to be released as part of the framework release
NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind("ng_package|pkg_npm", //packages/...)'` NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
# build all npm packages in parallel # build all npm packages in parallel
$BAZEL build --config=release $NPM_PACKAGE_LABELS $BAZEL build --config=release $NPM_PACKAGE_LABELS
# publish all packages in sequence to make it easier to spot any errors or warnings # publish all packages in sequence to make it easier to spot any errors or warnings