From 7e9ac7650b982b09a070e89cf61f813318885ba3 Mon Sep 17 00:00:00 2001 From: atscott Date: Fri, 10 Jan 2020 13:40:01 -0800 Subject: [PATCH] Revert "build: package-build & release scripts should handle new pkg_npm naming (#34589)" (#34730) This reverts commit 053b23d902afc356d50f813bd1e3ab6b606554a6. PR Close #34730 --- scripts/package-builder.js | 2 +- scripts/release/publish-latest | 2 +- scripts/release/publish-next | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/package-builder.js b/scripts/package-builder.js index 4451d3e427..da8a58167d 100755 --- a/scripts/package-builder.js +++ b/scripts/package-builder.js @@ -61,7 +61,7 @@ function buildTargetPackages(destPath, enableIvy, description) { // 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. 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/); // Use `--config=release` so that snapshot builds get published with embedded version info. diff --git a/scripts/release/publish-latest b/scripts/release/publish-latest index 54c142cfdc..d811b4c165 100755 --- a/scripts/release/publish-latest +++ b/scripts/release/publish-latest @@ -14,7 +14,7 @@ BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-latest.XXXXXXX) BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE" # 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 $BAZEL build --config=release $NPM_PACKAGE_LABELS # publish all packages in sequence to make it easier to spot any errors or warnings diff --git a/scripts/release/publish-next b/scripts/release/publish-next index e616498139..c0c611a67d 100755 --- a/scripts/release/publish-next +++ b/scripts/release/publish-next @@ -14,7 +14,7 @@ BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-next.XXXXXXX) BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE" # 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 $BAZEL build --config=release $NPM_PACKAGE_LABELS # publish all packages in sequence to make it easier to spot any errors or warnings